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

Fix flakyness in RemoteStoreRefreshListenerIT #8547

Merged
merged 2 commits into from
Jul 9, 2023
Merged

Fix flakyness in RemoteStoreRefreshListenerIT #8547

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
690e293
Fix flakyness in RemoteStoreRefreshListenerIT
ashking94 Jul 8, 2023
75d5987
Empty-Commit
ashking94 Jul 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
1 change: 0 additions & 1 deletion ...src/internalClusterTest/java/org/opensearch/remotestore/RemoteStoreRefreshListenerIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
@OpenSearchIntegTestCase.ClusterScope(scope = OpenSearchIntegTestCase.Scope.TEST, numDataNodes = 0)
public class RemoteStoreRefreshListenerIT extends AbstractRemoteStoreMockRepositoryIntegTestCase {

@AwaitsFix(bugUrl = "https://github.com/opensearch-project/OpenSearch/issues/7703")
public void testRemoteRefreshRetryOnFailure() throws Exception {

Path location = randomRepoPath().toAbsolutePath();
Expand Down
14 changes: 8 additions & 6 deletions server/src/main/java/org/opensearch/index/shard/RemoteStoreRefreshListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@
import java.util.Optional;
import java.util.Set;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Semaphore;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.stream.Collectors;
Expand Down Expand Up @@ -96,9 +95,9 @@ public final class RemoteStoreRefreshListener implements ReferenceManager.Refres
private long primaryTerm;

/**
* Semaphore that ensures there is only 1 retry scheduled at any time.
* This boolean is used to ensure that there is only 1 retry scheduled/running at any time.
*/
private final Semaphore SCHEDULE_RETRY_PERMITS = new Semaphore(1);
private final AtomicBoolean retryScheduled = new AtomicBoolean(false);

private volatile Iterator<TimeValue> backoffDelayIterator;

Expand Down Expand Up @@ -321,6 +320,9 @@ private void onSuccessfulSegmentsSync(
private void cancelAndResetScheduledCancellableRetry() {
if (scheduledCancellableRetry != null && scheduledCancellableRetry.getDelay(TimeUnit.NANOSECONDS) > 0) {
scheduledCancellableRetry.cancel();
// Since we are cancelling the retry attempt as an internal/external refresh happened already before the retry job could be
// started and the current run successfully uploaded the segments.
retryScheduled.set(false);
}
scheduledCancellableRetry = null;
}
Expand All @@ -333,14 +335,14 @@ private void resetBackOffDelayIterator() {
}

private void afterSegmentsSync(boolean isRetry, boolean shouldRetry) {
// If this was a retry attempt, then we release the semaphore at the end so that further retries can be scheduled
// If this was a retry attempt, then we set the retryScheduled to false so that the next retry (if needed) can be scheduled
if (isRetry) {
SCHEDULE_RETRY_PERMITS.release();
retryScheduled.set(false);
}

// If there are failures in uploading segments, then we should retry as search idle can lead to
// refresh not occurring until write happens.
if (shouldRetry && indexShard.state() != IndexShardState.CLOSED && SCHEDULE_RETRY_PERMITS.tryAcquire()) {
if (shouldRetry && indexShard.state() != IndexShardState.CLOSED && retryScheduled.compareAndSet(false, true)) {
scheduledCancellableRetry = indexShard.getThreadPool()
.schedule(() -> this.syncSegments(true), backoffDelayIterator.next(), ThreadPool.Names.REMOTE_REFRESH);
}
Expand Down