Resolve/cluster should handle IllegalArgumentException 'Unable to ope…

…n connection' as connected=false and not display error (elastic#105512) Fixed elastic#105489
nielsbauman · Feb 15, 2024 · 949a294 · 949a294
1 parent 4faaa28
commit 949a294
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/indices/cluster/ResolveClusterIT.java b/server/src/internalClusterTest/java/org/elasticsearch/indices/cluster/ResolveClusterIT.java
@@ -522,7 +522,6 @@ public void testClusterResolveWithMatchingAliases() throws IOException {
         }
     }
 
-    @AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/105489")
     public void testClusterResolveDisconnectedAndErrorScenarios() throws Exception {
         Map<String, Object> testClusterInfo = setupThreeClusters(false);
         String localIndex = (String) testClusterInfo.get("local.index");

diff --git a/...in/java/org/elasticsearch/action/admin/indices/resolve/TransportResolveClusterAction.java b/...in/java/org/elasticsearch/action/admin/indices/resolve/TransportResolveClusterAction.java
@@ -253,6 +253,9 @@ private boolean notConnectedError(Exception e) {
         if (e instanceof ConnectTransportException || e instanceof NoSuchRemoteClusterException) {
             return true;
         }
+        if (e instanceof IllegalStateException && e.getMessage().contains("Unable to open any connections")) {
+            return true;
+        }
         Throwable ill = ExceptionsHelper.unwrap(e, IllegalArgumentException.class);
         if (ill != null && ill.getMessage().contains("unknown host")) {
             return true;