Skip to content

Use try to close query response and unmute testThatRemoteErrorsAreWrapped #131090

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 11, 2025
Merged

Use try to close query response and unmute testThatRemoteErrorsAreWrapped #131090

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1e6234f
`testThatRemoteErrorsAreWrapped`: use `try` to close query response
pawankartik-elastic Jul 11, 2025
7a5858b
Merge branch 'main' into pkar/esql-err-wrap-try-resource
pawankartik-elastic Jul 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions muted-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -543,9 +543,6 @@ tests:
- class: org.elasticsearch.xpack.esql.action.CrossClusterAsyncQueryStopIT
method: testStopQueryLocal
issue: https://github.com/elastic/elasticsearch/issues/121672
- class: org.elasticsearch.xpack.esql.action.EsqlRemoteErrorWrapIT
method: testThatRemoteErrorsAreWrapped
issue: https://github.com/elastic/elasticsearch/issues/130794
- class: org.elasticsearch.backwards.MixedClusterClientYamlTestSuiteIT
method: test {p0=mtermvectors/10_basic/Tests catching other exceptions per item}
issue: https://github.com/elastic/elasticsearch/issues/122414
Expand Down
7 changes: 3 additions & 4 deletions ...c/internalClusterTest/java/org/elasticsearch/xpack/esql/action/EsqlRemoteErrorWrapIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"));
}
}