(ozone) branch master updated: HDDS-11927. Fix flaky TestContainerBalancerStatusInfo.testGetCurrentStatisticsWhileBalancingInProgress (#7579)

[adoroszlai]

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 f5e5493d01 HDDS-11927. Fix flaky 
TestContainerBalancerStatusInfo.testGetCurrentStatisticsWhileBalancingInProgress
 (#7579)
f5e5493d01 is described below

commit f5e5493d01cd88b9f88d47609331efb36c0b94c9
Author: Alexandr Juncevich <a.juncev...@gmail.com>
AuthorDate: Sun Dec 15 19:57:59 2024 +0300

    HDDS-11927. Fix flaky 
TestContainerBalancerStatusInfo.testGetCurrentStatisticsWhileBalancingInProgress
 (#7579)
---
 .../balancer/TestContainerBalancerStatusInfo.java    | 20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)

diff --git 
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/balancer/TestContainerBalancerStatusInfo.java
 
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/balancer/TestContainerBalancerStatusInfo.java
index ad5836ef44..e2d3003af0 100644
--- 
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/balancer/TestContainerBalancerStatusInfo.java
+++ 
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/balancer/TestContainerBalancerStatusInfo.java
@@ -24,7 +24,6 @@ import org.apache.hadoop.hdds.conf.OzoneConfiguration;
 import org.apache.hadoop.hdds.scm.server.StorageContainerManager;
 import org.apache.hadoop.ozone.OzoneConsts;
 import org.apache.ozone.test.LambdaTestUtils;
-import org.apache.ozone.test.tag.Flaky;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
@@ -95,9 +94,9 @@ class TestContainerBalancerStatusInfo {
     config.setMaxSizeToMovePerIteration(50 * OzoneConsts.GB);
 
     ContainerBalancerTask task = mockedScm.startBalancerTaskAsync(config, 
false);
-    LambdaTestUtils.await(1000, 500,
+    LambdaTestUtils.await(5000, 10,
         () -> task.getCurrentIterationsStatistic().size() == 1 &&
-              
task.getCurrentIterationsStatistic().get(0).getIterationResult().equals("ITERATION_COMPLETED"));
+              
"ITERATION_COMPLETED".equals(task.getCurrentIterationsStatistic().get(0).getIterationResult()));
     List<ContainerBalancerTaskIterationStatusInfo> iterationsStatic = 
task.getCurrentIterationsStatistic();
     assertEquals(1, iterationsStatic.size());
 
@@ -150,7 +149,6 @@ class TestContainerBalancerStatusInfo {
   }
 
   @Test
-  @Flaky("HDDS-11927")
   void testGetCurrentStatisticsWhileBalancingInProgress() throws Exception {
     MockedSCM mockedScm = new MockedSCM(new TestableCluster(20, 
OzoneConsts.GB));
 
@@ -162,7 +160,7 @@ class TestContainerBalancerStatusInfo {
 
     ContainerBalancerTask task = mockedScm.startBalancerTaskAsync(config, 
false);
     // Get the current iteration statistics when it has information about the 
containers moving.
-    LambdaTestUtils.await(1000, 10,
+    LambdaTestUtils.await(5000, 1,
         () -> task.getCurrentIterationsStatistic().size() == 2 &&
               
task.getCurrentIterationsStatistic().get(1).getContainerMovesScheduled() > 0);
     List<ContainerBalancerTaskIterationStatusInfo> iterationsStatic = 
task.getCurrentIterationsStatistic();
@@ -174,18 +172,11 @@ class TestContainerBalancerStatusInfo {
   private static void assertCurrentIterationStatisticWhileBalancingInProgress(
       ContainerBalancerTaskIterationStatusInfo iterationsStatic
   ) {
-
+    // No need to check others iterationsStatic fields(e.x. 
'*ContainerMoves*'), because it can lead to flaky results.
     assertEquals(2, iterationsStatic.getIterationNumber());
-    assertEquals(0, iterationsStatic.getIterationDuration());
     assertNull(iterationsStatic.getIterationResult());
-    assertTrue(iterationsStatic.getContainerMovesScheduled() > 0);
-    assertTrue(iterationsStatic.getContainerMovesCompleted() > 0);
     assertEquals(0, iterationsStatic.getContainerMovesFailed());
     assertEquals(0, iterationsStatic.getContainerMovesTimeout());
-    assertTrue(iterationsStatic.getSizeScheduledForMove() > 0);
-    assertTrue(iterationsStatic.getDataSizeMoved() > 0);
-    assertFalse(iterationsStatic.getSizeEnteringNodes().isEmpty());
-    assertFalse(iterationsStatic.getSizeLeavingNodes().isEmpty());
     iterationsStatic.getSizeEnteringNodes().forEach((id, size) -> {
       assertNotNull(id);
       assertTrue(size > 0);
@@ -194,9 +185,6 @@ class TestContainerBalancerStatusInfo {
       assertNotNull(id);
       assertTrue(size > 0);
     });
-    Long enteringDataSum = 
getTotalMovedData(iterationsStatic.getSizeEnteringNodes());
-    Long leavingDataSum = 
getTotalMovedData(iterationsStatic.getSizeLeavingNodes());
-    assertEquals(enteringDataSum, leavingDataSum);
   }
 
   private void verifyCompletedIteration(


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@ozone.apache.org
For additional commands, e-mail: commits-h...@ozone.apache.org