This is an automated email from the ASF dual-hosted git repository.
adoroszlai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new 305460d282 HDDS-9524. Clean up wait for leader OM in integration tests
(#6092)
305460d282 is described below
commit 305460d282afcb166d8c916ffc54d2a055caf52d
Author: david1859168 <[email protected]>
AuthorDate: Fri Jan 26 18:23:54 2024 +1100
HDDS-9524. Clean up wait for leader OM in integration tests (#6092)
---
.../apache/hadoop/ozone/MiniOzoneHAClusterImpl.java | 20 ++++++++------------
.../hadoop/ozone/om/TestAddRemoveOzoneManager.java | 4 ++--
.../apache/hadoop/ozone/om/TestOzoneManagerHA.java | 8 +-------
.../hadoop/ozone/om/TestOzoneManagerHASnapshot.java | 4 ++--
4 files changed, 13 insertions(+), 23 deletions(-)
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/MiniOzoneHAClusterImpl.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/MiniOzoneHAClusterImpl.java
index d79f28ba15..9d09ac43eb 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/MiniOzoneHAClusterImpl.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/MiniOzoneHAClusterImpl.java
@@ -170,18 +170,14 @@ public class MiniOzoneHAClusterImpl extends
MiniOzoneClusterImpl {
.findFirst().orElse(null);
}
- private OzoneManager getOMLeader(boolean waitForLeaderElection)
+ public OzoneManager waitForLeaderOM()
throws TimeoutException, InterruptedException {
- if (waitForLeaderElection) {
- final OzoneManager[] om = new OzoneManager[1];
- GenericTestUtils.waitFor(() -> {
- om[0] = getOMLeader();
- return om[0] != null;
- }, 200, waitForClusterToBeReadyTimeout);
- return om[0];
- } else {
- return getOMLeader();
- }
+ final OzoneManager[] om = new OzoneManager[1];
+ GenericTestUtils.waitFor(() -> {
+ om[0] = getOMLeader();
+ return om[0] != null;
+ }, 200, waitForClusterToBeReadyTimeout);
+ return om[0];
}
/**
@@ -731,7 +727,7 @@ public class MiniOzoneHAClusterImpl extends
MiniOzoneClusterImpl {
int retryCount = 0;
OzoneManager om = null;
- OzoneManager omLeader = getOMLeader(true);
+ OzoneManager omLeader = waitForLeaderOM();
long leaderSnapshotIndex = omLeader.getRatisSnapshotIndex();
while (true) {
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestAddRemoveOzoneManager.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestAddRemoveOzoneManager.java
index 1fa93cf416..54150ce90e 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestAddRemoveOzoneManager.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestAddRemoveOzoneManager.java
@@ -206,7 +206,7 @@ public class TestAddRemoveOzoneManager {
.toLong(TimeUnit.MILLISECONDS) * 3);
// Verify that one of the new OMs is the leader
- GenericTestUtils.waitFor(() -> cluster.getOMLeader() != null, 500, 30000);
+ cluster.waitForLeaderOM();
OzoneManager omLeader = cluster.getOMLeader();
assertThat(newOMNodeIds)
@@ -434,6 +434,6 @@ public class TestAddRemoveOzoneManager {
}, 100, 100000);
// Wait for new leader election if required
- GenericTestUtils.waitFor(() -> cluster.getOMLeader() != null, 500, 30000);
+ cluster.waitForLeaderOM();
}
}
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerHA.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerHA.java
index c18d1f8b17..c2b0241a1b 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerHA.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerHA.java
@@ -40,7 +40,6 @@ import org.apache.hadoop.ozone.client.io.OzoneOutputStream;
import org.apache.hadoop.ozone.client.rpc.RpcClient;
import org.apache.hadoop.ozone.om.ha.HadoopRpcOMFailoverProxyProvider;
import org.apache.hadoop.ozone.om.ratis.OzoneManagerRatisServerConfig;
-import org.apache.ozone.test.GenericTestUtils;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Timeout;
@@ -51,7 +50,6 @@ import java.time.Duration;
import java.util.Iterator;
import java.util.UUID;
import java.util.HashMap;
-import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import static java.nio.charset.StandardCharsets.UTF_8;
@@ -65,7 +63,6 @@ import static
org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_CLIENT_FAILOVER_MAX_
import static org.apache.hadoop.ozone.OzoneConsts.OM_KEY_PREFIX;
import static
org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_DEFAULT_BUCKET_LAYOUT;
import static
org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_KEY_DELETING_LIMIT_PER_TASK;
-import static
org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_OM_RATIS_SERVER_FAILURE_TIMEOUT_DURATION_DEFAULT;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -460,9 +457,6 @@ public abstract class TestOzoneManagerHA {
protected void waitForLeaderToBeReady()
throws InterruptedException, TimeoutException {
// Wait for Leader Election timeout
- int timeout = OZONE_OM_RATIS_SERVER_FAILURE_TIMEOUT_DURATION_DEFAULT
- .toIntExact(TimeUnit.MILLISECONDS);
- GenericTestUtils.waitFor(() ->
- getCluster().getOMLeader() != null, 500, timeout);
+ cluster.waitForLeaderOM();
}
}
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerHASnapshot.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerHASnapshot.java
index 5d9f8a0d48..fa91985b01 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerHASnapshot.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerHASnapshot.java
@@ -123,7 +123,7 @@ public class TestOzoneManagerHASnapshot {
cluster.shutdownOzoneManager(omLeader);
cluster.restartOzoneManager(omLeader, true);
- await(120_000, 100, () -> cluster.getOMLeader() != null);
+ cluster.waitForLeaderOM();
String newLeader = cluster.getOMLeader().getOMNodeId();
@@ -250,7 +250,7 @@ public class TestOzoneManagerHASnapshot {
cluster.shutdownOzoneManager(omLeader);
cluster.restartOzoneManager(omLeader, true);
- await(180_000, 100, () -> cluster.getOMLeader() != null);
+ cluster.waitForLeaderOM();
assertNotNull(cluster.getOMLeader());
OmMetadataManagerImpl metadataManager = (OmMetadataManagerImpl) cluster
.getOMLeader().getMetadataManager();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
