Skip to content

Commit 3a0c0c0

Browse files
authored
Fix flaky test IndexShardTests.testCommitLevelRestoreShardFromRemoteStore (opensearch-project#14418)
Signed-off-by: Sachin Kale <kalsac@amazon.com>
1 parent e22b651 commit 3a0c0c0

File tree

1 file changed

+8
-0
lines changed

1 file changed

+8
-0
lines changed

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

+8
Original file line numberDiff line numberDiff line change
@@ -2956,6 +2956,14 @@ public void testRestoreShardFromRemoteStore(boolean performFlush) throws IOExcep
29562956
)
29572957
);
29582958

2959+
// Make sure to drain refreshes from the shard. Otherwise, if the refresh is in-progress, it overlaps with
2960+
// deletion of segment files in the subsequent code block.
2961+
for (ReferenceManager.RefreshListener refreshListener : target.getEngine().config().getInternalRefreshListener()) {
2962+
if (refreshListener instanceof ReleasableRetryableRefreshListener) {
2963+
((ReleasableRetryableRefreshListener) refreshListener).drainRefreshes();
2964+
}
2965+
}
2966+
29592967
// Delete files in store directory to restore from remote directory
29602968
Directory storeDirectory = target.store().directory();
29612969

0 commit comments

Comments
 (0)