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 878eae21c33 HDDS-11093. Fix intermittent failure in 
TestContainerBalancerDatanodeNodeLimit#testMetrics (#10659)
878eae21c33 is described below

commit 878eae21c3385d3742820d2421a4f3558ca32b8f
Author: Chi-Hsuan Huang <[email protected]>
AuthorDate: Sat Jul 4 17:06:39 2026 +0800

    HDDS-11093. Fix intermittent failure in 
TestContainerBalancerDatanodeNodeLimit#testMetrics (#10659)
---
 .../container/balancer/TestContainerBalancerDatanodeNodeLimit.java  | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git 
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/balancer/TestContainerBalancerDatanodeNodeLimit.java
 
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/balancer/TestContainerBalancerDatanodeNodeLimit.java
index 3bf6f28c587..391648c2e77 100644
--- 
a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/balancer/TestContainerBalancerDatanodeNodeLimit.java
+++ 
b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/balancer/TestContainerBalancerDatanodeNodeLimit.java
@@ -246,7 +246,6 @@ public void 
unBalancedNodesListShouldBeEmptyWhenClusterIsBalanced(@Nonnull Mocke
 
   @ParameterizedTest(name = "MockedSCM #{index}: {0}")
   @MethodSource("createMockedSCMs")
-  @Flaky("HDDS-11093")
   public void testMetrics(@Nonnull MockedSCM mockedSCM) throws IOException, 
NodeNotFoundException {
     OzoneConfiguration ozoneConfig = new OzoneConfiguration();
     ozoneConfig.set("hdds.datanode.du.refresh.period", "1ms");
@@ -265,7 +264,10 @@ public void testMetrics(@Nonnull MockedSCM mockedSCM) 
throws IOException, NodeNo
     
assertEquals(mockedSCM.getCluster().getUnBalancedNodes(config.getThreshold()).size(),
         metrics.getNumDatanodesUnbalanced());
     
assertThat(metrics.getDataSizeMovedGBInLatestIteration()).isLessThanOrEqualTo(6);
-    assertThat(metrics.getDataSizeMovedGB()).isGreaterThan(0);
+    // On small clusters the random layout may allow only one move, which is 
the mocked failure, so data
+    // moved cannot be asserted to be positive. Each container is a whole 
number of GB, so the size moved
+    // must be at least 1 GB per completed move.
+    
assertThat(metrics.getDataSizeMovedGB()).isGreaterThanOrEqualTo(metrics.getNumContainerMovesCompleted());
     assertEquals(1, metrics.getNumIterations());
     
assertThat(metrics.getNumContainerMovesScheduledInLatestIteration()).isGreaterThan(0);
     assertEquals(metrics.getNumContainerMovesScheduled(), 
metrics.getNumContainerMovesScheduledInLatestIteration());


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to