Skip to content

Do not look over TaskCancelledException when looking at failures when updating CCS info for clusters #125206

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 4 commits into from
Mar 19, 2025
Merged

Do not look over TaskCancelledException when looking at failures when updating CCS info for clusters #125206

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
403c069
Do not look over `TaskCancelledException` when looking at failures
pawankartik-elastic Mar 19, 2025
ab34d49
Fix silly mistake
pawankartik-elastic Mar 19, 2025
e78511a
Move `isTaskCancelledException` to `ExceptionsHelper`
pawankartik-elastic Mar 19, 2025
031adff
Merge branch 'main' into pkar/do-not-wrap-task-cancellation
pawankartik-elastic Mar 19, 2025
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
3 changes: 0 additions & 3 deletions muted-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,9 +158,6 @@ tests:
- class: org.elasticsearch.xpack.ccr.FollowIndexSecurityIT
method: testCleanShardFollowTaskAfterDeleteFollower
issue: https://github.com/elastic/elasticsearch/issues/120339
- class: org.elasticsearch.search.ccs.CrossClusterIT
method: testCancel
issue: https://github.com/elastic/elasticsearch/issues/108061
- class: org.elasticsearch.reservedstate.service.FileSettingsServiceTests
method: testInvalidJSON
issue: https://github.com/elastic/elasticsearch/issues/120482
Expand Down
2 changes: 1 addition & 1 deletion server/src/main/java/org/elasticsearch/action/search/AbstractSearchAsyncAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -483,7 +483,7 @@ void onShardFailure(final int shardIndex, SearchShardTarget shardTarget, Excepti
}
}

private static boolean isTaskCancelledException(Exception e) {
static boolean isTaskCancelledException(Exception e) {
Copy link
Contributor

@quux00 quux00 Mar 19, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would say, let's move this method to ExceptionsHelper itself, since we need to call it in more than one place. It's a little awkward for TransportSearchAction to depend on methods in AbstractSearchAsyncAction.

return ExceptionsHelper.unwrapCausesAndSuppressed(e, ex -> ex instanceof TaskCancelledException).isPresent();
}

Expand Down
5 changes: 3 additions & 2 deletions server/src/main/java/org/elasticsearch/action/search/TransportSearchAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@
import java.util.function.LongSupplier;
import java.util.stream.Collectors;

import static org.elasticsearch.action.search.AbstractSearchAsyncAction.isTaskCancelledException;
import static org.elasticsearch.action.search.SearchType.DFS_QUERY_THEN_FETCH;
import static org.elasticsearch.action.search.SearchType.QUERY_THEN_FETCH;
import static org.elasticsearch.action.search.TransportSearchHelper.checkCCSVersionCompatibility;
Expand Down Expand Up @@ -1716,7 +1717,7 @@ public final void onFailure(Exception e) {
ShardSearchFailure f = new ShardSearchFailure(e);
logCCSError(f, clusterAlias, skipUnavailable);
SearchResponse.Cluster cluster = clusters.getCluster(clusterAlias);
if (skipUnavailable) {
if (skipUnavailable && isTaskCancelledException(e) == false) {
if (cluster != null) {
ccsClusterInfoUpdate(f, clusters, clusterAlias, true);
}
Expand All @@ -1725,7 +1726,7 @@ public final void onFailure(Exception e) {
ccsClusterInfoUpdate(f, clusters, clusterAlias, false);
}
Exception exception = e;
if (RemoteClusterAware.LOCAL_CLUSTER_GROUP_KEY.equals(clusterAlias) == false) {
if (RemoteClusterAware.LOCAL_CLUSTER_GROUP_KEY.equals(clusterAlias) == false && isTaskCancelledException(e) == false) {
exception = wrapRemoteClusterFailure(clusterAlias, e);
}
if (exceptions.compareAndSet(null, exception) == false) {
Expand Down
Loading