[BUG] Wait for outstanding requests to complete in LastSuccessfulSett… (

#1939) * [BUG] Wait for outstanding requests to complete in LastSuccessfulSettingsUpdate test Signed-off-by: Suraj Singh <surajrider@gmail.com> * [BUG] Wait for outstanding requests to complete in LastSuccessfulSettingsUpdate test Signed-off-by: Suraj Singh <surajrider@gmail.com>
opensearch-project · Jan 20, 2022 · 27e05cc · 27e05cc
1 parent 6eb8f6f
commit 27e05cc
Showing 1 changed file with 9 additions and 8 deletions.
diff --git a/...er/src/internalClusterTest/java/org/opensearch/index/ShardIndexingPressureSettingsIT.java b/...er/src/internalClusterTest/java/org/opensearch/index/ShardIndexingPressureSettingsIT.java
@@ -403,14 +403,7 @@ public void testShardIndexingPressureEnforcedEnabledDisabledSetting() throws Exc
         secondSuccessFuture = client(coordinatingOnlyNode).bulk(bulkRequest);
         Thread.sleep(25);
 
-        assertBusy(
-            () -> {
-                assertEquals(
-                    coordinatingShardTracker.getCoordinatingOperationTracker().getPerformanceTracker().getTotalOutstandingRequests(),
-                    2
-                );
-            }
-        );
+        waitForTwoOutstandingRequests(coordinatingShardTracker);
 
         // This request breaches the threshold and hence will be rejected
         expectThrows(OpenSearchRejectedExecutionException.class, () -> client(coordinatingOnlyNode).bulk(bulkRequest).actionGet());
@@ -645,6 +638,7 @@ public void testShardIndexingPressureLastSuccessfulSettingsUpdate() throws Excep
                 IndexingPressureService.class,
                 coordinatingOnlyNode
             ).getShardIndexingPressure().getShardIndexingPressureTracker(shardId);
+            waitForTwoOutstandingRequests(coordinatingShardTracker);
             expectThrows(OpenSearchRejectedExecutionException.class, () -> client(coordinatingOnlyNode).bulk(bulkRequest).actionGet());
             assertEquals(1, coordinatingShardTracker.getCoordinatingOperationTracker().getRejectionTracker().getTotalRejections());
             assertEquals(
@@ -657,6 +651,7 @@ public void testShardIndexingPressureLastSuccessfulSettingsUpdate() throws Excep
             ShardIndexingPressureTracker primaryShardTracker = internalCluster().getInstance(IndexingPressureService.class, primaryName)
                 .getShardIndexingPressure()
                 .getShardIndexingPressureTracker(shardId);
+            waitForTwoOutstandingRequests(primaryShardTracker);
             expectThrows(OpenSearchRejectedExecutionException.class, () -> client(primaryName).bulk(bulkRequest).actionGet());
             assertEquals(1, primaryShardTracker.getCoordinatingOperationTracker().getRejectionTracker().getTotalRejections());
             assertEquals(
@@ -929,6 +924,12 @@ private String getCoordinatingOnlyNode() {
             .getName();
     }
 
+    private static void waitForTwoOutstandingRequests(ShardIndexingPressureTracker tracker) throws Exception {
+        assertBusy(
+            () -> { assertEquals(tracker.getCoordinatingOperationTracker().getPerformanceTracker().getTotalOutstandingRequests(), 2); }
+        );
+    }
+
     private void restartCluster(Settings settings) throws Exception {
         internalCluster().fullRestart(new InternalTestCluster.RestartCallback() {
             @Override