Do not look over TaskCancelledException when looking at failures

Author: pawankartik-elastic

muted-tests.yml

@@ -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

server/src/main/java/org/elasticsearch/action/search/AbstractSearchAsyncAction.java

@@ -483,7 +483,7 @@ void onShardFailure(final int shardIndex, SearchShardTarget shardTarget, Excepti
         }
     }
 
-    private static boolean isTaskCancelledException(Exception e) {
+    static boolean isTaskCancelledException(Exception e) {
         return ExceptionsHelper.unwrapCausesAndSuppressed(e, ex -> ex instanceof TaskCancelledException).isPresent();
     }
 

server/src/main/java/org/elasticsearch/action/search/TransportSearchAction.java

@@ -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;
@@ -1717,15 +1718,15 @@ public final void onFailure(Exception e) {
             logCCSError(f, clusterAlias, skipUnavailable);
             SearchResponse.Cluster cluster = clusters.getCluster(clusterAlias);
             if (skipUnavailable) {
-                if (cluster != null) {
+                if (cluster != null && isTaskCancelledException(e) == false) {
                     ccsClusterInfoUpdate(f, clusters, clusterAlias, true);
                 }
             } else {
                 if (cluster != null) {
                     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) {