You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ozone.apache.org by er...@apache.org on 2026/09/22 17:38:37 UTC
(ozone) branch HDDS-14496-zdu updated: HDDS-16500. Test stabilization fixes for the ZDU branch (#11258)
This is an automated email from the ASF dual-hosted git repository.
errose28 pushed a commit to branch HDDS-14496-zdu
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/HDDS-14496-zdu by this push:
new 3bb8eedde39 HDDS-16500. Test stabilization fixes for the ZDU branch (#11258)
3bb8eedde39 is described below
commit 3bb8eedde390c0b7d5b1ca7dbe2558b464665d25
Author: Ethan Rose <33...@users.noreply.github.com>
AuthorDate: Tue Sep 22 13:38:30 2026 -0400
HDDS-16500. Test stabilization fixes for the ZDU branch (#11258)
---
.../hadoop/hdds/upgrade/TestScmDataDistributionFinalization.java | 5 ++++-
.../src/test/java/org/apache/hadoop/ozone/om/OMUpgradeTestUtils.java | 5 ++---
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/upgrade/TestScmDataDistributionFinalization.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/upgrade/TestScmDataDistributionFinalization.java
index 502e6db3340..52ae5280289 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/upgrade/TestScmDataDistributionFinalization.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/upgrade/TestScmDataDistributionFinalization.java
@@ -334,7 +334,10 @@ public void testFinalizationNonEmptyClusterDataDistribution() throws Exception {
break;
}
}
+ // Leader transfer is async. Wait for the new election to finish.
cluster.getStorageContainerLocationClient().transferLeadership(newLeaderScmId);
+ GenericTestUtils.waitFor(
+ () -> cluster.getActiveSCM() != null, 100, 10_000);
StorageContainerManager newActiveSCM = cluster.getActiveSCM();
deletedBlockLog = (DeletedBlockLogImpl) newActiveSCM.getScmBlockManager().getDeletedBlockLog();
SCMDeletedBlockTransactionStatusManager newStatusManager =
@@ -365,7 +368,7 @@ public void testFinalizationNonEmptyClusterDataDistribution() throws Exception {
fail("Error while checking container state", e);
return false;
}
- }, 100, 5000);
+ }, 100, 30_000);
// wait for block deletion transactions to be confirmed by DN
GenericTestUtils.waitFor(
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/OMUpgradeTestUtils.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/OMUpgradeTestUtils.java
index e3239283064..281aa3c8b04 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/OMUpgradeTestUtils.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/OMUpgradeTestUtils.java
@@ -18,7 +18,6 @@
package org.apache.hadoop.ozone.om;
import static org.apache.ozone.test.GenericTestUtils.waitFor;
-import static org.junit.jupiter.api.Assertions.fail;
import java.io.IOException;
import java.util.concurrent.TimeoutException;
@@ -50,9 +49,9 @@ public static void waitForFinalization(OzoneManagerProtocol omClient)
hdds.getNumDatanodesFinalized(), hdds.getNumDatanodesTotal());
return status.getClusterFinalizationStatus() == HddsProtos.FinalizationStatus.FINALIZED;
} catch (IOException e) {
- fail(e.getMessage());
+ LOG.error("Failed to poll finalization status. Will retry", e);
}
return false;
- }, 2000, 20000);
+ }, 2000, 60_000);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@ozone.apache.org
For additional commands, e-mail: commits-help@ozone.apache.org