From aecf435ebf7d6f6b9f79373ec1c7652fd573f71a Mon Sep 17 00:00:00 2001
From: "opensearch-trigger-bot[bot]"
 <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com>
Date: Mon, 10 Jul 2023 12:57:33 +0530
Subject: [PATCH] Fix flakyness in RemoteStoreRefreshListenerTests (#8550)
 (#8562)

---------


(cherry picked from commit 9fd1ddb6a2c2df60a9b201a6b5e47041fa145ecd)

Signed-off-by: Ashish Singh <ssashish@amazon.com>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 .../RemoteStoreRefreshListenerTests.java      | 27 +++++++++----------
 1 file changed, 13 insertions(+), 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
index 1c2ddf43f8274..3cad46cecca5f 100644
--- 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);
     }
 
     /**
@@ -305,7 +299,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;
@@ -323,11 +317,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 {