Fix Flaky Test ClusterRerouteIT.testDelayWithALargeAmountOfShards (#1…

…4510) Signed-off-by: kkewwei [email protected] Signed-off-by: kkewwei [email protected] Signed-off-by: kkewwei <[email protected]> (cherry picked from commit badf851) Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
opensearch-project · Jun 25, 2024 · 649006f · 649006f
1 parent f27a0ad
commit 649006f
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/server/src/internalClusterTest/java/org/opensearch/cluster/allocation/ClusterRerouteIT.java b/server/src/internalClusterTest/java/org/opensearch/cluster/allocation/ClusterRerouteIT.java
@@ -273,7 +273,8 @@ public void testDelayWithALargeAmountOfShards() throws Exception {
         internalCluster().stopRandomNode(InternalTestCluster.nameFilter(node_1));
 
         // This might run slowly on older hardware
-        ensureGreen(TimeValue.timeValueMinutes(2));
+        // In some case, the shards will be rebalanced back and forth, it seems like a very low probability bug.
+        ensureGreen(TimeValue.timeValueMinutes(2), false);
     }
 
     private void rerouteWithAllocateLocalGateway(Settings commonSettings) throws Exception {

diff --git a/test/framework/src/main/java/org/opensearch/test/OpenSearchIntegTestCase.java b/test/framework/src/main/java/org/opensearch/test/OpenSearchIntegTestCase.java
@@ -863,6 +863,10 @@ public ClusterHealthStatus ensureGreen(TimeValue timeout, String... indices) {
         return ensureColor(ClusterHealthStatus.GREEN, timeout, false, indices);
     }
 
+    public ClusterHealthStatus ensureGreen(TimeValue timeout, boolean waitForNoRelocatingShards, String... indices) {
+        return ensureColor(ClusterHealthStatus.GREEN, timeout, waitForNoRelocatingShards, false, indices);
+    }
+
     /**
      * Ensures the cluster has a yellow state via the cluster health API.
      */
@@ -890,6 +894,16 @@ private ClusterHealthStatus ensureColor(
         TimeValue timeout,
         boolean waitForNoInitializingShards,
         String... indices
+    ) {
+        return ensureColor(clusterHealthStatus, timeout, true, waitForNoInitializingShards, indices);
+    }
+
+    private ClusterHealthStatus ensureColor(
+        ClusterHealthStatus clusterHealthStatus,
+        TimeValue timeout,
+        boolean waitForNoRelocatingShards,
+        boolean waitForNoInitializingShards,
+        String... indices
     ) {
         String color = clusterHealthStatus.name().toLowerCase(Locale.ROOT);
         String method = "ensure" + Strings.capitalize(color);
@@ -898,7 +912,7 @@ private ClusterHealthStatus ensureColor(
             .timeout(timeout)
             .waitForStatus(clusterHealthStatus)
             .waitForEvents(Priority.LANGUID)
-            .waitForNoRelocatingShards(true)
+            .waitForNoRelocatingShards(waitForNoRelocatingShards)
             .waitForNoInitializingShards(waitForNoInitializingShards)
             // We currently often use ensureGreen or ensureYellow to check whether the cluster is back in a good state after shutting down
             // a node. If the node that is stopped is the cluster-manager node, another node will become cluster-manager and publish a