Skip to content

Commit 52706da

Browse files
Fix flaky RemoteStoreRefreshListenerTests test #11256 (#11803) (#11902)
(cherry picked from commit 517f091) Signed-off-by: Ashish Singh <[email protected]> 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>
1 parent 8a30378 commit 52706da

File tree

1 file changed

+9
-2
lines changed

1 file changed

+9
-2
lines changed

server/src/test/java/org/opensearch/index/shard/RemoteStoreRefreshListenerTests.java

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -433,7 +433,7 @@ public void testTrackerData() throws Exception {
433433
RemoteStoreRefreshListener listener = tuple.v1();
434434
RemoteStoreStatsTrackerFactory trackerFactory = tuple.v2();
435435
RemoteSegmentTransferTracker tracker = trackerFactory.getRemoteSegmentTransferTracker(indexShard.shardId());
436-
assertNoLag(tracker);
436+
assertBusy(() -> assertNoLag(tracker));
437437
indexDocs(100, randomIntBetween(100, 200));
438438
indexShard.refresh("test");
439439
listener.afterRefresh(true);
@@ -533,6 +533,14 @@ private Tuple<RemoteStoreRefreshListener, RemoteStoreStatsTrackerFactory> mockIn
533533
new InternalEngineFactory()
534534
);
535535

536+
RemoteSegmentTransferTracker tracker = indexShard.getRemoteStoreStatsTrackerFactory()
537+
.getRemoteSegmentTransferTracker(indexShard.shardId());
538+
try {
539+
assertBusy(() -> assertTrue(tracker.getTotalUploadsSucceeded() > 0));
540+
} catch (Exception e) {
541+
assert false;
542+
}
543+
536544
indexDocs(1, randomIntBetween(1, 100));
537545

538546
// Mock indexShard.store().directory()
@@ -619,7 +627,6 @@ private Tuple<RemoteStoreRefreshListener, RemoteStoreStatsTrackerFactory> mockIn
619627
RecoverySettings recoverySettings = mock(RecoverySettings.class);
620628
when(recoverySettings.getMinRemoteSegmentMetadataFiles()).thenReturn(10);
621629
when(shard.getRecoverySettings()).thenReturn(recoverySettings);
622-
RemoteSegmentTransferTracker tracker = remoteStoreStatsTrackerFactory.getRemoteSegmentTransferTracker(indexShard.shardId());
623630
RemoteStoreRefreshListener refreshListener = new RemoteStoreRefreshListener(shard, emptyCheckpointPublisher, tracker);
624631
refreshListener.afterRefresh(true);
625632
return Tuple.tuple(refreshListener, remoteStoreStatsTrackerFactory);

0 commit comments

Comments
 (0)