From f26186448d6f5683616f83d8a04c7774c669f974 Mon Sep 17 00:00:00 2001 From: Pawan Kartik Date: Fri, 11 Jul 2025 15:43:40 +0100 Subject: [PATCH 1/2] `testThatRemoteErrorsAreWrapped`: use `try` to close query response (#131090) Explicitly close the ES|QL query response obtained in the test to avoid potential leak. (cherry picked from commit f536069206f71b37e6c41aad19bace5a90a6c557) # Conflicts: # muted-tests.yml --- muted-tests.yml | 2 +- .../xpack/esql/action/EsqlRemoteErrorWrapIT.java | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/muted-tests.yml b/muted-tests.yml index a762977c892b6..e267a88263501 100644 --- a/muted-tests.yml +++ b/muted-tests.yml @@ -440,4 +440,4 @@ tests: issue: https://github.com/elastic/elasticsearch/issues/127782 - class: org.elasticsearch.search.CCSDuelIT method: testTerminateAfter - issue: https://github.com/elastic/elasticsearch/issues/126085 + issue: https://github.com/elastic/elasticsearch/issues/126085 \ No newline at end of file diff --git a/x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/action/EsqlRemoteErrorWrapIT.java b/x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/action/EsqlRemoteErrorWrapIT.java index bc4d5d35ea71c..f6a9836929f35 100644 --- a/x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/action/EsqlRemoteErrorWrapIT.java +++ b/x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/action/EsqlRemoteErrorWrapIT.java @@ -34,10 +34,9 @@ public void testThatRemoteErrorsAreWrapped() throws Exception { ); } - RemoteException wrappedError = expectThrows( - RemoteException.class, - () -> runQuery("FROM " + REMOTE_CLUSTER_1 + ":*," + REMOTE_CLUSTER_2 + ":* | LIMIT 100", false) - ); + RemoteException wrappedError = expectThrows(RemoteException.class, () -> { + try (EsqlQueryResponse ignored = runQuery("FROM " + REMOTE_CLUSTER_1 + ":*," + REMOTE_CLUSTER_2 + ":* | LIMIT 100", false)) {} + }); assertThat(wrappedError.getMessage(), is("Remote [cluster-a] encountered an error")); } } From f188ec27cbe85161b4d213638a61b33b60b190ea Mon Sep 17 00:00:00 2001 From: Pawan Kartik Date: Fri, 11 Jul 2025 15:50:01 +0100 Subject: [PATCH 2/2] Fix formatting --- muted-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/muted-tests.yml b/muted-tests.yml index e267a88263501..a762977c892b6 100644 --- a/muted-tests.yml +++ b/muted-tests.yml @@ -440,4 +440,4 @@ tests: issue: https://github.com/elastic/elasticsearch/issues/127782 - class: org.elasticsearch.search.CCSDuelIT method: testTerminateAfter - issue: https://github.com/elastic/elasticsearch/issues/126085 \ No newline at end of file + issue: https://github.com/elastic/elasticsearch/issues/126085