Fix for flaky test SimpleBlocksIT.testAddBlockWhileDeletingIndices (#…

…11492) Signed-off-by: Ankit Kala <ankikala@amazon.com>
opensearch-project · Dec 6, 2023 · a3c7952 · a3c7952
1 parent c204585
commit a3c7952
Showing 1 changed file with 15 additions and 4 deletions.
diff --git a/server/src/internalClusterTest/java/org/opensearch/blocks/SimpleBlocksIT.java b/server/src/internalClusterTest/java/org/opensearch/blocks/SimpleBlocksIT.java
@@ -47,6 +47,7 @@
 import org.opensearch.cluster.block.ClusterBlockLevel;
 import org.opensearch.cluster.metadata.IndexMetadata;
 import org.opensearch.cluster.metadata.IndexMetadata.APIBlock;
+import org.opensearch.cluster.metadata.ProcessClusterEventTimeoutException;
 import org.opensearch.cluster.routing.ShardRouting;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.index.IndexNotFoundException;
@@ -491,10 +492,20 @@ public void testAddBlockWhileDeletingIndices() throws Exception {
                     } catch (InterruptedException e) {
                         throw new AssertionError(e);
                     }
-                    try {
-                        assertAcked(client().admin().indices().prepareDelete(indexToDelete));
-                    } catch (final Exception e) {
-                        exceptionConsumer.accept(e);
+                    int pendingRetries = 3;
+                    boolean success = false;
+                    while (success == false && pendingRetries-- > 0) {
+                        try {
+                            assertAcked(client().admin().indices().prepareDelete(indexToDelete));
+                            success = true;
+                        } catch (final Exception e) {
+                            Throwable cause = ExceptionsHelper.unwrapCause(e);
+                            if (cause instanceof ProcessClusterEventTimeoutException && pendingRetries > 0) {
+                                // ignore error & retry
+                                continue;
+                            }
+                            exceptionConsumer.accept(e);
+                        }
                     }
                 }));
             }