Skip to content

Commit c479e1e

Browse files
authored
HDDS-14774. Fix intermittent timeout in TestContainerReportHandling (#10535)
1 parent 150062e commit c479e1e

2 files changed

Lines changed: 4 additions & 0 deletions

File tree

hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/TestContainerReportHandling.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
package org.apache.hadoop.ozone.container;
1919

2020
import static java.nio.charset.StandardCharsets.UTF_8;
21+
import static org.apache.hadoop.hdds.HddsConfigKeys.HDDS_CONTAINER_REPORT_INTERVAL;
2122
import static org.apache.hadoop.hdds.scm.ScmConfigKeys.OZONE_SCM_DEADNODE_INTERVAL;
2223
import static org.apache.hadoop.hdds.scm.ScmConfigKeys.OZONE_SCM_STALENODE_INTERVAL;
2324
import static org.apache.hadoop.ozone.container.TestHelper.waitForContainerClose;
@@ -91,6 +92,7 @@ void testDeletingOrDeletedContainerWhenNonEmptyReplicaIsReported(
9192
OzoneConfiguration conf = new OzoneConfiguration();
9293
conf.setTimeDuration(OZONE_SCM_STALENODE_INTERVAL, 3, TimeUnit.SECONDS);
9394
conf.setTimeDuration(OZONE_SCM_DEADNODE_INTERVAL, 6, TimeUnit.SECONDS);
95+
conf.setTimeDuration(HDDS_CONTAINER_REPORT_INTERVAL, 1, TimeUnit.SECONDS);
9496

9597
Path clusterPath = null;
9698
try (MiniOzoneCluster cluster = newCluster(conf, replicationInput.getNumDatanodes())) {

hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/TestContainerReportHandlingWithHA.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
package org.apache.hadoop.ozone.container;
1919

2020
import static java.nio.charset.StandardCharsets.UTF_8;
21+
import static org.apache.hadoop.hdds.HddsConfigKeys.HDDS_CONTAINER_REPORT_INTERVAL;
2122
import static org.apache.hadoop.hdds.scm.ScmConfigKeys.OZONE_SCM_DEADNODE_INTERVAL;
2223
import static org.apache.hadoop.hdds.scm.ScmConfigKeys.OZONE_SCM_STALENODE_INTERVAL;
2324
import static org.apache.hadoop.ozone.container.TestHelper.waitForContainerClose;
@@ -94,6 +95,7 @@ void testDeletingOrDeletedContainerWhenNonEmptyReplicaIsReportedWithScmHA(
9495
OzoneConfiguration conf = new OzoneConfiguration();
9596
conf.setTimeDuration(OZONE_SCM_STALENODE_INTERVAL, 3, TimeUnit.SECONDS);
9697
conf.setTimeDuration(OZONE_SCM_DEADNODE_INTERVAL, 6, TimeUnit.SECONDS);
98+
conf.setTimeDuration(HDDS_CONTAINER_REPORT_INTERVAL, 1, TimeUnit.SECONDS);
9799

98100
int numSCM = 3;
99101
Path clusterPath = null;

0 commit comments

Comments
 (0)