Skip to content
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

Fix and unmute CrossClusterEsqlRCS1UnavailableRemotesIT tests #120388

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Fix and unmute CrossClusterEsqlRCS1UnavailableRemotesIT tests #120388

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
98981e1
Unmute `CrossClusterEsqlRCS1UnavailableRemotesIT.testEsqlRcs1Unavaila…
pawankartik-elastic Jan 17, 2025
9b00da0
Merge branch 'main' into pkar/esql-rcs1-unavail-remotes-unmute
pawankartik-elastic Jan 17, 2025
f16ef75
Track `node_not_connected_exception`
pawankartik-elastic Jan 17, 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 @@ -170,9 +170,6 @@ tests:
- class: org.elasticsearch.action.search.SearchQueryThenFetchAsyncActionTests
method: testBottomFieldSort
issue: https://github.com/elastic/elasticsearch/issues/118214
- class: org.elasticsearch.xpack.remotecluster.CrossClusterEsqlRCS1UnavailableRemotesIT
method: testEsqlRcs1UnavailableRemoteScenarios
issue: https://github.com/elastic/elasticsearch/issues/118350
- class: org.elasticsearch.xpack.searchablesnapshots.RetrySearchIntegTests
method: testSearcherId
issue: https://github.com/elastic/elasticsearch/issues/118374
Expand Down
6 changes: 5 additions & 1 deletion .../java/org/elasticsearch/xpack/remotecluster/CrossClusterEsqlRCS1UnavailableRemotesIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@

import static org.hamcrest.CoreMatchers.containsString;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.Matchers.anyOf;
import static org.hamcrest.Matchers.greaterThan;

public class CrossClusterEsqlRCS1UnavailableRemotesIT extends AbstractRemoteClusterSecurityTestCase {
Expand Down Expand Up @@ -177,7 +178,10 @@ private void remoteClusterShutdownWithSkipUnavailableFalse() throws Exception {
// A simple query that targets our remote cluster.
String query = "FROM *,my_remote_cluster:* | LIMIT 10";
ResponseException ex = expectThrows(ResponseException.class, () -> client().performRequest(esqlRequest(query)));
assertThat(ex.getMessage(), containsString("connect_transport_exception"));
assertThat(
ex.getMessage(),
anyOf(containsString("connect_transport_exception"), containsString("node_disconnected_exception"))
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should also have the third variant added we saw in the enrich tests.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pushed a commit to fix this.

);
} finally {
fulfillingCluster.start();
closeFulfillingClusterClient();
Expand Down