Skip to content

Commit 9c8e7c2

Browse files
Merge branch 'main' into inference-index-fix
2 parents 7727d0c + 6a73f89 commit 9c8e7c2

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

muted-tests.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -346,6 +346,8 @@ tests:
346346
issue: https://github.com/elastic/elasticsearch/issues/115129
347347
- class: org.elasticsearch.xpack.esql.ccq.MultiClusterSpecIT
348348
issue: https://github.com/elastic/elasticsearch/issues/115135
349+
- class: org.elasticsearch.backwards.MixedClusterClientYamlTestSuiteIT
350+
issue: https://github.com/elastic/elasticsearch/issues/115213
349351

350352
# Examples:
351353
#

server/src/main/java/org/elasticsearch/action/search/SearchResponse.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -787,7 +787,8 @@ public boolean hasClusterObjects() {
787787
* This will be false for local-cluster (non-CCS) only searches.
788788
*/
789789
public boolean hasRemoteClusters() {
790-
return total > 1 || clusterInfo.keySet().stream().anyMatch(alias -> alias != RemoteClusterAware.LOCAL_CLUSTER_GROUP_KEY);
790+
return total > 1
791+
|| clusterInfo.keySet().stream().anyMatch(alias -> alias.equals(RemoteClusterAware.LOCAL_CLUSTER_GROUP_KEY) == false);
791792
}
792793

793794
}

0 commit comments

Comments
 (0)