Fix flakyness in RemoteStoreRefreshListenerTests (opensearch-project#…

…8550) --------- Signed-off-by: Ashish Singh <[email protected]>
dzane17 · Jul 12, 2023 · a8abbf0 · a8abbf0
1 parent c99f6ba
commit a8abbf0
Showing 1 changed file with 13 additions and 14 deletions.
diff --git a/server/src/test/java/org/opensearch/index/shard/RemoteStoreRefreshListenerTests.java b/server/src/test/java/org/opensearch/index/shard/RemoteStoreRefreshListenerTests.java
@@ -21,9 +21,9 @@
 import org.opensearch.cluster.service.ClusterService;
 import org.opensearch.common.collect.Tuple;
 import org.opensearch.common.concurrent.GatedCloseable;
+import org.opensearch.common.lease.Releasable;
 import org.opensearch.common.settings.ClusterSettings;
 import org.opensearch.common.settings.Settings;
-import org.opensearch.common.lease.Releasable;
 import org.opensearch.index.engine.InternalEngineFactory;
 import org.opensearch.index.remote.RemoteRefreshSegmentPressureService;
 import org.opensearch.index.remote.RemoteRefreshSegmentTracker;
@@ -249,10 +249,7 @@ public void testRefreshSuccessOnFirstAttempt() throws Exception {
         assertBusy(() -> assertEquals(0, successLatch.getCount()));
         RemoteRefreshSegmentPressureService pressureService = tuple.v2();
         RemoteRefreshSegmentTracker segmentTracker = pressureService.getRemoteRefreshSegmentTracker(indexShard.shardId());
-        assertEquals(0, segmentTracker.getBytesLag());
-        assertEquals(0, segmentTracker.getRefreshSeqNoLag());
-        assertEquals(0, segmentTracker.getTimeMsLag());
-        assertEquals(0, segmentTracker.getTotalUploadsFailed());
+        assertNoLagAndTotalUploadsFailed(segmentTracker, 0);
     }
 
     public void testRefreshSuccessOnSecondAttempt() throws Exception {
@@ -273,10 +270,7 @@ public void testRefreshSuccessOnSecondAttempt() throws Exception {
         assertBusy(() -> assertEquals(0, successLatch.getCount()));
         RemoteRefreshSegmentPressureService pressureService = tuple.v2();
         RemoteRefreshSegmentTracker segmentTracker = pressureService.getRemoteRefreshSegmentTracker(indexShard.shardId());
-        assertEquals(0, segmentTracker.getBytesLag());
-        assertEquals(0, segmentTracker.getRefreshSeqNoLag());
-        assertEquals(0, segmentTracker.getTimeMsLag());
-        assertEquals(1, segmentTracker.getTotalUploadsFailed());
+        assertNoLagAndTotalUploadsFailed(segmentTracker, 1);
     }
 
     /**
@@ -304,7 +298,7 @@ public void testRefreshSuccessAfterFailureInFirstAttemptAfterSnapshotAndMetadata
         assertBusy(() -> assertEquals(0, reachedCheckpointPublishLatch.getCount()));
     }
 
-    public void testRefreshSuccessOnThirdAttemptAttempt() throws Exception {
+    public void testRefreshSuccessOnThirdAttempt() throws Exception {
         // This covers 3 cases - 1) isRetry=false, shouldRetry=true 2) isRetry=true, shouldRetry=false 3) isRetry=True, shouldRetry=true
         // Succeed on 3rd attempt
         int succeedOnAttempt = 3;
@@ -322,11 +316,16 @@ public void testRefreshSuccessOnThirdAttemptAttempt() throws Exception {
         assertBusy(() -> assertEquals(0, successLatch.getCount()));
         RemoteRefreshSegmentPressureService pressureService = tuple.v2();
         RemoteRefreshSegmentTracker segmentTracker = pressureService.getRemoteRefreshSegmentTracker(indexShard.shardId());
-        assertEquals(0, segmentTracker.getBytesLag());
-        assertEquals(0, segmentTracker.getRefreshSeqNoLag());
-        assertEquals(0, segmentTracker.getTimeMsLag());
-        assertEquals(2, segmentTracker.getTotalUploadsFailed());
+        assertNoLagAndTotalUploadsFailed(segmentTracker, 2);
+    }
 
+    private void assertNoLagAndTotalUploadsFailed(RemoteRefreshSegmentTracker segmentTracker, long totalUploadsFailed) throws Exception {
+        assertBusy(() -> {
+            assertEquals(0, segmentTracker.getBytesLag());
+            assertEquals(0, segmentTracker.getRefreshSeqNoLag());
+            assertEquals(0, segmentTracker.getTimeMsLag());
+            assertEquals(totalUploadsFailed, segmentTracker.getTotalUploadsFailed());
+        });
     }
 
     public void testTrackerData() throws Exception {