Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Remote Segments] Retry segment uploads to remote store on failure #7400

Merged
merged 10 commits into from
May 9, 2023
+527 −82
Merged

[Remote Segments] Retry segment uploads to remote store on failure #7400

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
ea84f4f
[Remote Segments] Retry remote refresh on failure
ashking94 May 3, 2023
27c2312
Merge remote-tracking branch 'upstream/main' into 7363
ashking94 May 4, 2023
7589820
[Remote Segments] Introduce exponential backoff retry on failures
ashking94 May 4, 2023
0f015a9
Incorporate PR review feedback
ashking94 May 4, 2023
1eb8c5d
Incorporate PR review feedback
ashking94 May 6, 2023
be43780
Fix success countdown latch in UT & remove redundant condition
ashking94 May 8, 2023
f80f4ac
Empty-Commit
ashking94 May 8, 2023
843ea40
Refactor code
ashking94 May 8, 2023
c0ac5dc
Empty-Commit
ashking94 May 8, 2023
b7be6f2
Added missed condition
ashking94 May 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions server/src/test/java/org/opensearch/index/shard/RemoteStoreRefreshListenerTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,8 @@ public void testRefreshSuccessOnFirstAttempt() throws Exception {
// We spy on IndexShard.getReplicationTracker() to validate that we have tried running remote time as per the expectation.
CountDownLatch refreshCountLatch = new CountDownLatch(succeedOnAttempt);
// We spy on IndexShard.getEngine() to validate that we have successfully hit the terminal code for ascertaining successful upload.
CountDownLatch successLatch = new CountDownLatch(2);
// Value has been set as 3 as during a successful upload IndexShard.getEngine() is hit thrice and with mockito we are counting down
CountDownLatch successLatch = new CountDownLatch(3);
ashking94 marked this conversation as resolved.
Show resolved Hide resolved
mockIndexShardWithRetryAndScheduleRefresh(succeedOnAttempt, refreshCountLatch, successLatch);
assertBusy(() -> assertEquals(0, refreshCountLatch.getCount()));
assertBusy(() -> assertEquals(0, successLatch.getCount()));
Expand Down Expand Up @@ -302,7 +303,6 @@ private void mockIndexShardWithRetryAndScheduleRefresh(
return indexShard.getSegmentInfosSnapshot();
}).when(shard).getSegmentInfosSnapshot();

when(shard.getEngine()).thenReturn(indexShard.getEngine());
doAnswer(invocation -> {
successLatch.countDown();
return indexShard.getEngine();
Expand Down