HDDS-10709. Intermittent failure in TestContainerBalancerOperations (#6582)

Author: sarvekshayr

hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestContainerBalancerOperations.java

@@ -25,14 +25,15 @@
 import org.apache.hadoop.hdds.scm.container.balancer.ContainerBalancerConfiguration;
 import org.apache.hadoop.hdds.scm.container.placement.algorithms.SCMContainerPlacementCapacity;
 
-import org.apache.ozone.test.tag.Unhealthy;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.Timeout;
 
 import java.util.Optional;
 
+import static java.util.concurrent.TimeUnit.SECONDS;
+import static org.apache.hadoop.hdds.HddsConfigKeys.HDDS_NODE_REPORT_INTERVAL;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -53,6 +54,8 @@ public static void setup() throws Exception {
     ozoneConf = new OzoneConfiguration();
     ozoneConf.setClass(ScmConfigKeys.OZONE_SCM_CONTAINER_PLACEMENT_IMPL_KEY,
         SCMContainerPlacementCapacity.class, PlacementPolicy.class);
+    ozoneConf.setTimeDuration(HDDS_NODE_REPORT_INTERVAL, 5, SECONDS);
+    ozoneConf.setBoolean("hdds.container.balancer.trigger.du.before.move.enable", true);
     cluster = MiniOzoneCluster.newBuilder(ozoneConf).setNumDatanodes(3).build();
     containerBalancerClient = new ContainerOperationClient(ozoneConf);
     cluster.waitForClusterToBeReady();
@@ -70,9 +73,6 @@ public static void cleanup() throws Exception {
    * @throws Exception
    */
   @Test
-  @Unhealthy("Since the cluster doesn't have " +
-      "unbalanced nodes, ContainerBalancer stops before the assertion checks " +
-      "whether balancer is running.")
   public void testContainerBalancerCLIOperations() throws Exception {
     // test normally start and stop
     boolean running = containerBalancerClient.getContainerBalancerStatus();
@@ -82,11 +82,11 @@ public void testContainerBalancerCLIOperations() throws Exception {
     Optional<Integer> maxDatanodesPercentageToInvolvePerIteration =
         Optional.of(100);
     Optional<Long> maxSizeToMovePerIterationInGB = Optional.of(1L);
-    Optional<Long> maxSizeEnteringTargetInGB = Optional.of(1L);
-    Optional<Long> maxSizeLeavingSourceInGB = Optional.of(1L);
-    Optional<Integer> balancingInterval = Optional.of(1);
-    Optional<Integer> moveTimeout = Optional.of(1);
-    Optional<Integer> moveReplicationTimeout = Optional.of(1);
+    Optional<Long> maxSizeEnteringTargetInGB = Optional.of(6L);
+    Optional<Long> maxSizeLeavingSourceInGB = Optional.of(6L);
+    Optional<Integer> balancingInterval = Optional.of(70);
+    Optional<Integer> moveTimeout = Optional.of(65);
+    Optional<Integer> moveReplicationTimeout = Optional.of(55);
     Optional<Boolean> networkTopologyEnable = Optional.of(false);
     Optional<String> includeNodes = Optional.of("");
     Optional<String> excludeNodes = Optional.of("");
@@ -103,7 +103,7 @@ public void testContainerBalancerCLIOperations() throws Exception {
     // TODO: this is a temporary implementation for now
     // modify this after balancer is fully completed
     try {
-      Thread.sleep(100);
+      Thread.sleep(20000);
     } catch (InterruptedException e) { }
 
     running = containerBalancerClient.getContainerBalancerStatus();