Skip to content

Use TaskCancelledException in TMNA #86659

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

Merged
merged 2 commits into from
May 11, 2022
Merged

Use TaskCancelledException in TMNA #86659

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
2f1cebe
Use TaskCancelledException in TMNA
DaveCTurner May 11, 2022
b3b15cb
Update docs/changelog/86659.yaml
DaveCTurner May 11, 2022
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
5 changes: 5 additions & 0 deletions docs/changelog/86659.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
pr: 86659
summary: Use `TaskCancelledException` in TMNA
area: Task Management
type: bug
issues: []
6 changes: 3 additions & 3 deletions server/src/main/java/org/elasticsearch/action/support/master/TransportMasterNodeAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,13 @@
import org.elasticsearch.node.NodeClosedException;
import org.elasticsearch.tasks.CancellableTask;
import org.elasticsearch.tasks.Task;
import org.elasticsearch.tasks.TaskCancelledException;
import org.elasticsearch.threadpool.ThreadPool;
import org.elasticsearch.transport.ConnectTransportException;
import org.elasticsearch.transport.RemoteTransportException;
import org.elasticsearch.transport.TransportException;
import org.elasticsearch.transport.TransportService;

import java.util.concurrent.CancellationException;
import java.util.function.Predicate;

/**
Expand Down Expand Up @@ -114,7 +114,7 @@ protected abstract void masterOperation(Task task, Request request, ClusterState
private void executeMasterOperation(Task task, Request request, ClusterState state, ActionListener<Response> listener)
throws Exception {
if (task instanceof CancellableTask && ((CancellableTask) task).isCancelled()) {
throw new CancellationException("Task was cancelled");
throw new TaskCancelledException("Task was cancelled");
}

masterOperation(task, request, state, listener);
Expand Down Expand Up @@ -168,7 +168,7 @@ class AsyncSingleAction {

protected void doStart(ClusterState clusterState) {
if (isTaskCancelled()) {
listener.onFailure(new CancellationException("Task was cancelled"));
listener.onFailure(new TaskCancelledException("Task was cancelled"));
return;
}
try {
Expand Down
6 changes: 3 additions & 3 deletions ...src/test/java/org/elasticsearch/action/support/master/TransportMasterNodeActionTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
import org.elasticsearch.rest.RestStatus;
import org.elasticsearch.tasks.CancellableTask;
import org.elasticsearch.tasks.Task;
import org.elasticsearch.tasks.TaskCancelledException;
import org.elasticsearch.tasks.TaskId;
import org.elasticsearch.tasks.TaskManager;
import org.elasticsearch.test.ESTestCase;
Expand All @@ -65,7 +66,6 @@
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.concurrent.CancellationException;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.CyclicBarrier;
import java.util.concurrent.ExecutionException;
Expand Down Expand Up @@ -594,7 +594,7 @@ protected ClusterBlockException checkBlock(Request request, ClusterState state)
}
setState(clusterService, newStateBuilder.build());
}
expectThrows(CancellationException.class, listener::actionGet);
expectThrows(TaskCancelledException.class, listener::actionGet);
}

public void testTaskCancellationOnceActionItIsDispatchedToMaster() throws Exception {
Expand All @@ -621,7 +621,7 @@ public void testTaskCancellationOnceActionItIsDispatchedToMaster() throws Except

releaseBlockedThreads.run();

expectThrows(CancellationException.class, listener::actionGet);
expectThrows(TaskCancelledException.class, listener::actionGet);
}

public void testGlobalBlocksAreCheckedAfterIndexNotFoundException() throws Exception {
Expand Down