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

Fully stop RetryableAction when cancelled #55614

Merged
merged 3 commits into from
Apr 24, 2020
Merged

Fully stop RetryableAction when cancelled #55614

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9657f8f
Fully stop RetryableAction when cancelled
Tim-Brooks Apr 22, 2020
45bfc73
Chnage
Tim-Brooks Apr 22, 2020
78e6120
Changes
Tim-Brooks Apr 23, 2020
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
16 changes: 14 additions & 2 deletions server/src/main/java/org/elasticsearch/action/support/RetryableAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import org.elasticsearch.action.ActionRunnable;
import org.elasticsearch.common.Randomness;
import org.elasticsearch.common.unit.TimeValue;
import org.elasticsearch.threadpool.Scheduler;
import org.elasticsearch.threadpool.ThreadPool;

import java.util.ArrayDeque;
Expand All @@ -48,6 +49,8 @@ public abstract class RetryableAction<Response> {
private final ActionListener<Response> finalListener;
private final String executor;

private volatile Scheduler.ScheduledCancellable retryTask;

public RetryableAction(Logger logger, ThreadPool threadPool, TimeValue initialDelay, TimeValue timeoutValue,
ActionListener<Response> listener) {
this(logger, threadPool, initialDelay, timeoutValue, listener, ThreadPool.Names.SAME);
Expand Down Expand Up @@ -75,6 +78,10 @@ public void run() {

public void cancel(Exception e) {
if (isDone.compareAndSet(false, true)) {
Scheduler.ScheduledCancellable localRetryTask = this.retryTask;
if (localRetryTask != null) {
localRetryTask.cancel();
}
finalListener.onFailure(e);
}
}
Expand All @@ -84,11 +91,16 @@ private Runnable createRunnable(RetryingListener retryingListener) {

@Override
protected void doRun() {
tryAction(listener);
retryTask = null;
// It is possible that the task was cancelled in between the retry being dispatched and now
if (isDone.get() == false) {
tryAction(listener);
}
}

@Override
public void onRejection(Exception e) {
retryTask = null;
// TODO: The only implementations of this class use SAME which means the execution will not be
// rejected. Future implementations can adjust this functionality as needed.
onFailure(e);
Expand Down Expand Up @@ -140,7 +152,7 @@ public void onFailure(Exception e) {
if (isDone.get() == false) {
final TimeValue delay = TimeValue.timeValueMillis(delayMillis);
logger.debug(() -> new ParameterizedMessage("retrying action that failed in {}", delay), e);
threadPool.schedule(runnable, delay, executor);
retryTask = threadPool.schedule(runnable, delay, executor);
}
}
} else {
Expand Down
3 changes: 2 additions & 1 deletion server/src/test/java/org/elasticsearch/action/support/RetryableActionTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,8 @@ public boolean shouldRetry(Exception e) {
retryableAction.cancel(new ElasticsearchException("Cancelled"));
taskQueue.runAllRunnableTasks();

assertEquals(2, executedCount.get());
// A second run will not occur because it is cancelled
assertEquals(1, executedCount.get());
expectThrows(ElasticsearchException.class, future::actionGet);
}
}