[HDDS-9524] Clean up wait for leader OM in integration tests

• Type: Sub-task
• Status: Resolved
• Priority: Major
• Resolution: Implemented
• Fix Version/s: 2.0.0
• Component/s: test
• Labels: GoodForNewContributors good-first-issue pull-request-available
• Assignee: David
• Reporter: Attila Doroszlai
• Created: 24/Oct/23 07:46
• Updated: 26/Jan/24 07:26
• Resolved: 26/Jan/24 07:24

Description

MiniOzoneHAClusterImpl:

• getOMLeader() returns current OM leader.
• getOMLeader(boolean) optionally waits until OM leader is elected

There are some tests that implement the same "wait for leader OM" logic using the non-waiting getOMLeader(). Some examples (there may be more!):

hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestAddRemoveOzoneManager.java
209:    GenericTestUtils.waitFor(() -> cluster.getOMLeader() != null, 500, 30000);
437:    GenericTestUtils.waitFor(() -> cluster.getOMLeader() != null, 500, 30000);

hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerHA.java
466:        getCluster().getOMLeader() != null, 500, timeout);

hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerHASnapshot.java
126:    await(120_000, 100, () -> cluster.getOMLeader() != null);
253:    await(180_000, 100, () -> cluster.getOMLeader() != null);

Goals of this task:

• rename getOMLeader(boolean) to waitForLeaderOM() (the method is only called with true)
• make waitForLeaderOM() public
• replace duplicated wait logic in tests with a call to waitForLeaderOM()

Issue Links

• links to: GitHub Pull Request #6092