fixed flaky integration tests

Signed-off-by: Divyansh Pandey <dpaandey@amazon.com>

Author: Divyansh Pandey

server/src/internalClusterTest/java/org/opensearch/cluster/routing/allocation/decider/ShardsLimitAllocationDeciderRemoteStoreEnabledIT.java

@@ -8,7 +8,7 @@
 
 package org.opensearch.cluster.routing.allocation.decider;
 
-import org.apache.lucene.tests.util.LuceneTestCase;
+import org.opensearch.action.admin.indices.flush.FlushRequest;
 import org.opensearch.action.admin.indices.settings.put.UpdateSettingsRequest;
 import org.opensearch.action.support.clustermanager.AcknowledgedResponse;
 import org.opensearch.cluster.ClusterState;
@@ -19,14 +19,14 @@
 import org.opensearch.test.OpenSearchIntegTestCase;
 import org.junit.Before;
 
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
 import static org.opensearch.cluster.routing.allocation.decider.ShardsLimitAllocationDecider.CLUSTER_TOTAL_PRIMARY_SHARDS_PER_NODE_SETTING;
 import static org.opensearch.cluster.routing.allocation.decider.ShardsLimitAllocationDecider.INDEX_TOTAL_PRIMARY_SHARDS_PER_NODE_SETTING;
 
-@LuceneTestCase.AwaitsFix(bugUrl = "https://github.com/opensearch-project/OpenSearch/issues/17693")
 @OpenSearchIntegTestCase.ClusterScope(scope = OpenSearchIntegTestCase.Scope.TEST, numDataNodes = 0)
 public class ShardsLimitAllocationDeciderRemoteStoreEnabledIT extends RemoteStoreBaseIntegTestCase {
     @Before
@@ -101,6 +101,7 @@ public void testIndexPrimaryShardLimit() throws Exception {
                 assertTrue("No node should have more than 1 primary shard of test1", count <= 1);
             }
         });
+        cleanUp(new String[] { "test1", "test2" });
     }
 
     public void testUpdatingIndexPrimaryShardLimit() throws Exception {
@@ -170,6 +171,7 @@ public void testUpdatingIndexPrimaryShardLimit() throws Exception {
                 assertTrue("No node should have more than 1 primary shard of test1", count <= 1);
             }
         });
+        cleanUp(new String[] { "test1" });
     }
 
     public void testClusterPrimaryShardLimitss() throws Exception {
@@ -224,6 +226,7 @@ public void testClusterPrimaryShardLimitss() throws Exception {
                 assertTrue("No node should have more than 1 primary shard", count <= 1);
             }
         });
+        cleanUp(new String[] { "test1" });
     }
 
     public void testCombinedIndexAndClusterPrimaryShardLimits() throws Exception {
@@ -313,9 +316,27 @@ public void testCombinedIndexAndClusterPrimaryShardLimits() throws Exception {
                 assertTrue("No node should have more than 3 primary shards total", count <= 3);
             }
         });
+        cleanUp(new String[] { "test1", "test2" });
     }
 
     private void updateClusterSetting(String setting, int value) {
         client().admin().cluster().prepareUpdateSettings().setTransientSettings(Settings.builder().put(setting, value)).get();
     }
+
+    private void cleanUp(String[] indices) throws Exception {
+        logger.info(">>> Starting custom tearDown in ShardsLimitAllocationDeciderRemoteStoreEnabledIT");
+        try {
+            // Synchronization: Force flush relevant indices.
+            logger.info("Attempting to flush indices {} to help sync remote store before cleanup...", Arrays.toString(indices));
+
+            FlushRequest flushRequest = new FlushRequest(indices);
+            flushRequest.force(true); // Force even if no changes detected
+            flushRequest.waitIfOngoing(true); // Wait if flush already in progress
+            client().admin().indices().flush(flushRequest).actionGet(); // Use actionGet() or get() to wait
+            logger.info("Flush request for {} completed.", Arrays.toString(indices));
+
+        } catch (Exception e) {
+            logger.error("Exception during pre-teardown synchronization flush: {} - {}", e.getClass().getName(), e.getMessage(), e);
+        }
+    }
 }