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 8c6c3b61a2a HDDS-16550. Intermittent failure in
testSnapshotDiffWhenOmLeaderRestart (#11299)
8c6c3b61a2a is described below
commit 8c6c3b61a2a896e31d15489ba7a1f0dcc4fa3edc
Author: Doroszlai, Attila <[email protected]>
AuthorDate: Tue Sep 22 14:52:52 2026 +0200
HDDS-16550. Intermittent failure in testSnapshotDiffWhenOmLeaderRestart
(#11299)
---
.../om/snapshot/TestOzoneManagerHASnapshot.java | 32 +++++-----------------
1 file changed, 7 insertions(+), 25 deletions(-)
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestOzoneManagerHASnapshot.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestOzoneManagerHASnapshot.java
index 05dabc8df8b..119c8fe0286 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestOzoneManagerHASnapshot.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestOzoneManagerHASnapshot.java
@@ -33,7 +33,6 @@
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
-import java.util.Objects;
import java.util.UUID;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ExecutionException;
@@ -125,38 +124,21 @@ public void testSnapshotDiffWhenOmLeaderRestart()
assertEquals(IN_PROGRESS, response.getJobStatus());
- String oldLeader = cluster.getOMLeader().getOMNodeId();
-
OzoneManager omLeader = cluster.getOMLeader();
cluster.shutdownOzoneManager(omLeader);
cluster.restartOzoneManager(omLeader, true);
cluster.waitForLeaderOM();
- String newLeader = cluster.getOMLeader().getOMNodeId();
-
- if (Objects.equals(oldLeader, newLeader)) {
- // If old leader becomes leader again. Job should be done by this time.
- response = store.snapshotDiff(volumeName, bucketName,
- snapshot1, snapshot2, null, 0, false, false);
- assertEquals(DONE, response.getJobStatus());
- assertEquals(100, response.getSnapshotDiffReport().getDiffList().size());
- } else {
- // If new leader is different from old leader. SnapDiff request will be
- // new to OM, and job status should be IN_PROGRESS.
+ while (true) {
response = store.snapshotDiff(volumeName, bucketName, snapshot1,
- snapshot2, null, 0, false, false);
- assertEquals(IN_PROGRESS, response.getJobStatus());
- while (true) {
- response = store.snapshotDiff(volumeName, bucketName, snapshot1,
- snapshot2, null, 0, false, false);
- if (DONE == response.getJobStatus()) {
- assertEquals(100,
- response.getSnapshotDiffReport().getDiffList().size());
- break;
- }
- Thread.sleep(response.getWaitTimeInMs());
+ snapshot2, null, 0, false, false);
+ if (DONE == response.getJobStatus()) {
+ assertEquals(100,
+ response.getSnapshotDiffReport().getDiffList().size());
+ break;
}
+ Thread.sleep(response.getWaitTimeInMs());
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
