Skip to content

Relax exception condition on testFilterWithUnavailableRemote #135797

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 3 commits into from
Oct 1, 2025
Merged

Relax exception condition on testFilterWithUnavailableRemote #135797

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f5565df
Sometimes it throws IllegalStateException. I don't think we care
smalyshev Oct 1, 2025
162e346
Spotless
smalyshev Oct 1, 2025
51ca4fd
Merge branch 'main' into fix133450
smalyshev Oct 1, 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 @@ -429,9 +429,6 @@ tests:
- class: org.elasticsearch.xpack.search.CrossClusterAsyncSearchIT
method: testCancelViaExpirationOnRemoteResultsWithMinimizeRoundtrips
issue: https://github.com/elastic/elasticsearch/issues/127302
- class: org.elasticsearch.xpack.esql.action.CrossClusterQueryWithFiltersIT
method: testFilterWithUnavailableRemote
issue: https://github.com/elastic/elasticsearch/issues/133450
- class: org.elasticsearch.xpack.esql.qa.multi_node.EsqlClientYamlIT
method: test {p0=esql/60_usage/*}
issue: https://github.com/elastic/elasticsearch/issues/133461
Expand Down
7 changes: 3 additions & 4 deletions ...lClusterTest/java/org/elasticsearch/xpack/esql/action/CrossClusterQueryWithFiltersIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@

package org.elasticsearch.xpack.esql.action;

import org.elasticsearch.ElasticsearchException;
import org.elasticsearch.client.internal.Client;
import org.elasticsearch.cluster.RemoteException;
import org.elasticsearch.common.Strings;
Expand Down Expand Up @@ -420,11 +419,11 @@ private void checkRemoteFailures() {
new RangeQueryBuilder("@timestamp").from("2025-01-01").to("now")
)) {
// One index
var e = expectThrows(ElasticsearchException.class, () -> runQuery("from cluster-a:log-2", randomBoolean(), filter).close());
var e = expectThrows(RuntimeException.class, () -> runQuery("from cluster-a:log-2", randomBoolean(), filter).close());
// Two indices
e = expectThrows(ElasticsearchException.class, () -> runQuery("from logs-1,cluster-a:log-2", randomBoolean(), filter).close());
e = expectThrows(RuntimeException.class, () -> runQuery("from logs-1,cluster-a:log-2", randomBoolean(), filter).close());
// Wildcard
e = expectThrows(ElasticsearchException.class, () -> runQuery("from logs-1,cluster-a:log*", randomBoolean(), filter).close());
e = expectThrows(RuntimeException.class, () -> runQuery("from logs-1,cluster-a:log*", randomBoolean(), filter).close());
}
}

Expand Down