Make cancel to fail and other feedback

Author: smalyshev

x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/action/CrossClustersCancellationIT.java

@@ -237,7 +237,7 @@ public void testTasks() throws Exception {
         requestFuture.actionGet(30, TimeUnit.SECONDS).close();
     }
 
-    // Check that cancelling remote task with skip_unavailable=true produces partial
+    // Check that cancelling remote task with skip_unavailable=true produces failure
     public void testCancelSkipUnavailable() throws Exception {
         createRemoteIndex(between(10, 100));
         EsqlQueryRequest request = EsqlQueryRequest.syncEsqlQueryRequest();
@@ -276,16 +276,9 @@ public void testCancelSkipUnavailable() throws Exception {
         } finally {
             SimplePauseFieldPlugin.allowEmitting.countDown();
         }
-        var resp = requestFuture.actionGet();
-        EsqlExecutionInfo executionInfo = resp.getExecutionInfo();
 
-        assertNotNull(executionInfo);
-        assertThat(executionInfo.isPartial(), equalTo(true));
-        EsqlExecutionInfo.Cluster cluster = executionInfo.getCluster(REMOTE_CLUSTER);
-
-        assertThat(cluster.getStatus(), equalTo(EsqlExecutionInfo.Cluster.Status.PARTIAL));
-        assertThat(cluster.getFailures().size(), equalTo(1));
-        assertThat(cluster.getFailures().get(0).getCause(), instanceOf(TaskCancelledException.class));
+        Exception error = expectThrows(Exception.class, requestFuture::actionGet);
+        assertThat(error.getMessage(), containsString("remote failed"));
     }
 
     // Check that closing remote node with skip_unavailable=true produces partial

x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/action/CrossClustersQueryIT.java

@@ -846,8 +846,8 @@ public void testWarnings() throws Exception {
         assertTrue(latch.await(30, TimeUnit.SECONDS));
     }
 
-    // Non-disconnect remote failures still fail the request
-    public void testRemoteFailureSkipUnavailable() throws IOException {
+    // Non-disconnect remote failures still fail the request even if skip_unavailable is true
+    public void testRemoteFailureSkipUnavailableTrue() throws IOException {
         Map<String, Object> testClusterInfo = setupFailClusters();
         String localIndex = (String) testClusterInfo.get("local.index");
         String remote1Index = (String) testClusterInfo.get("remote.index");

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/session/EsqlCCSUtils.java

@@ -360,12 +360,14 @@ public static void markClusterWithFinalStateAndNoShards(
         });
     }
 
+    /**
+     * We will ignore the error if it's remote unavailable and the cluster is marked to skip unavailable.
+     */
     public static boolean shouldIgnoreRuntimeError(EsqlExecutionInfo executionInfo, String clusterAlias, Exception e) {
         if (executionInfo.isSkipUnavailable(clusterAlias) == false) {
             return false;
         }
 
-        return ExceptionsHelper.isRemoteUnavailableException(e)
-            || (e instanceof RemoteTransportException && ExceptionsHelper.unwrap(e, TaskCancelledException.class) != null);
+        return ExceptionsHelper.isRemoteUnavailableException(e);
     }
 }