[helix] branch master updated: Fix TestClusterAggregateMetrics (#2602)

[xyuanlu]

This is an automated email from the ASF dual-hosted git repository.

xyuanlu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/helix.git


The following commit(s) were added to refs/heads/master by this push:
     new c607364c8 Fix TestClusterAggregateMetrics (#2602)
c607364c8 is described below

commit c607364c87bcf1d4241358569b6f1dfbbd241258
Author: Xiaxuan Gao <32374858+markg...@users.noreply.github.com>
AuthorDate: Sat Sep 16 09:30:43 2023 -0700

    Fix TestClusterAggregateMetrics (#2602)
    
    Fix flaky test TestClusterAggregateMetrics
    ---------
    
    Co-authored-by: Xiaxuan Gao <xiax...@linkedin.com>
---
 .../helix/monitoring/mbeans/TestClusterAggregateMetrics.java | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git 
a/helix-core/src/test/java/org/apache/helix/monitoring/mbeans/TestClusterAggregateMetrics.java
 
b/helix-core/src/test/java/org/apache/helix/monitoring/mbeans/TestClusterAggregateMetrics.java
index f42b6f263..1cb3860ac 100644
--- 
a/helix-core/src/test/java/org/apache/helix/monitoring/mbeans/TestClusterAggregateMetrics.java
+++ 
b/helix-core/src/test/java/org/apache/helix/monitoring/mbeans/TestClusterAggregateMetrics.java
@@ -156,7 +156,9 @@ public class TestClusterAggregateMetrics extends ZkTestBase 
{
     expectedMetricValues.put(ERROR_PARTITION_COUNT, 0L);
     expectedMetricValues.put(WITHOUT_TOPSTATE_COUNT, 0L);
     expectedMetricValues.put(IS_EV_MISMATCH_COUNT, 0L);
-    Assert.assertTrue(verifyMetrics(expectedMetricValues));
+    Assert.assertTrue(TestHelper.verify(() -> {
+      return verifyMetrics(expectedMetricValues);
+    }, TestHelper.WAIT_DURATION), "Expected metrics and observed metrics don't 
align.");
 
     // Disable all Participants (instances)
     _setupTool.getClusterManagementTool()
@@ -183,7 +185,9 @@ public class TestClusterAggregateMetrics extends ZkTestBase 
{
     Assert.assertTrue(verifier.verifyByPolling());
 
     expectedMetricValues.put(WITHOUT_TOPSTATE_COUNT, 5L);
-    Assert.assertTrue(verifyMetrics(expectedMetricValues));
+    Assert.assertTrue(TestHelper.verify(() -> {
+      return verifyMetrics(expectedMetricValues);
+    }, TestHelper.WAIT_DURATION), "Expected metrics and observed metrics don't 
align.");
 
     // Re-enable all Participants (instances)
     for (int i = 0; i < NUM_PARTICIPANTS; i++) {
@@ -223,7 +227,9 @@ public class TestClusterAggregateMetrics extends ZkTestBase 
{
     Assert.assertTrue(verifier.verifyByPolling());
 
     expectedMetricValues.put(PARTITION_COUNT, 0L);
-    Assert.assertTrue(verifyMetrics(expectedMetricValues));
+    Assert.assertTrue(TestHelper.verify(() -> {
+      return verifyMetrics(expectedMetricValues);
+    }, TestHelper.WAIT_DURATION), "Expected metrics and observed metrics don't 
align.");
   }
 
   /**