Better exception check

Author: smalyshev

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

@@ -39,6 +39,7 @@
 import java.util.concurrent.atomic.AtomicReference;
 
 import static org.elasticsearch.xpack.esql.session.EsqlSessionCCSUtils.markClusterWithFinalStateAndNoShards;
+import static org.elasticsearch.xpack.esql.session.EsqlSessionCCSUtils.shouldIgnoreRuntimeError;
 
 /**
  * Manages computes across multiple clusters by sending {@link ClusterComputeRequest} to remote clusters and executing the computes.
@@ -131,7 +132,7 @@ void startComputeOnRemoteCluster(
                         new ActionListenerResponseHandler<>(clusterListener, ComputeResponse::new, esqlExecutor)
                     );
                 }, e -> {
-                    if (executionInfo.isSkipUnavailable(clusterAlias)) {
+                    if (shouldIgnoreRuntimeError(executionInfo, clusterAlias, e)) {
                         markClusterWithFinalStateAndNoShards(executionInfo, clusterAlias, EsqlExecutionInfo.Cluster.Status.SKIPPED, e);
                         openExchangeListener.onResponse(null);
                     } else {

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

@@ -62,6 +62,7 @@
 
 import static org.elasticsearch.xpack.esql.plugin.EsqlPlugin.ESQL_WORKER_THREAD_POOL_NAME;
 import static org.elasticsearch.xpack.esql.session.EsqlSessionCCSUtils.markClusterWithFinalStateAndNoShards;
+import static org.elasticsearch.xpack.esql.session.EsqlSessionCCSUtils.shouldIgnoreRuntimeError;
 
 /**
  * Computes the result of a {@link PhysicalPlan}.
@@ -284,7 +285,7 @@ public void execute(
                             updateExecutionInfo(execInfo, clusterAlias, r);
                             remoteListener.onResponse(r.getProfiles());
                         }, e -> {
-                            if (shouldIgnoreRemoteError(clusterAlias, e)) {
+                            if (shouldIgnoreRuntimeError(execInfo, clusterAlias, e)) {
                                 markClusterWithFinalStateAndNoShards(execInfo, clusterAlias, EsqlExecutionInfo.Cluster.Status.SKIPPED, e);
                                 remoteListener.onResponse(Collections.emptyList());
                             } else {
@@ -297,10 +298,6 @@ public void execute(
         }
     }
 
-    private boolean shouldIgnoreRemoteError(String clusterAlias, Exception e) {
-        return true;
-    }
-
     private void updateExecutionInfo(EsqlExecutionInfo executionInfo, String clusterAlias, ComputeResponse resp) {
         Function<EsqlExecutionInfo.Cluster.Status, EsqlExecutionInfo.Cluster.Status> runningToSuccess = status -> {
             if (status == EsqlExecutionInfo.Cluster.Status.RUNNING) {

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

@@ -357,4 +357,11 @@ public static void markClusterWithFinalStateAndNoShards(
             return builder.build();
         });
     }
+
+    public static boolean shouldIgnoreRuntimeError(EsqlExecutionInfo executionInfo, String clusterAlias, Exception e) {
+        if (executionInfo.isSkipUnavailable(clusterAlias) == false) {
+            return false;
+        }
+        return ExceptionsHelper.isRemoteUnavailableException(e);
+    }
 }

x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/session/EsqlSessionCCSUtilsTests.java

@@ -534,7 +534,7 @@ public void testUpdateExecutionInfoAtEndOfPlanning() {
 
     private void assertClusterStatusAndShardCounts(EsqlExecutionInfo.Cluster cluster, EsqlExecutionInfo.Cluster.Status status) {
         assertThat(cluster.getStatus(), equalTo(status));
-        assertNull(cluster.getTook());
+        assertThat(cluster.getTook().millis(), greaterThanOrEqualTo(0L));
         if (status == EsqlExecutionInfo.Cluster.Status.RUNNING) {
             assertNull(cluster.getTotalShards());
             assertNull(cluster.getSuccessfulShards());