Skip to content

Commit 2be11f1

Browse files
committed
Block remote query search too
1 parent 9eadfac commit 2be11f1

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

muted-tests.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -381,9 +381,6 @@ tests:
381381
- class: org.elasticsearch.packaging.test.DockerTests
382382
method: test050BasicApiTests
383383
issue: https://github.com/elastic/elasticsearch/issues/120911
384-
- class: org.elasticsearch.xpack.search.CrossClusterAsyncSearchIT
385-
method: testCancellationViaTimeoutWithAllowPartialResultsSetToFalse
386-
issue: https://github.com/elastic/elasticsearch/issues/131248
387384
- class: org.elasticsearch.packaging.test.DockerTests
388385
method: test010Install
389386
issue: https://github.com/elastic/elasticsearch/issues/131376

x-pack/plugin/async-search/src/internalClusterTest/java/org/elasticsearch/xpack/search/CrossClusterAsyncSearchIT.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1752,6 +1752,7 @@ public void testCancellationViaTimeoutWithAllowPartialResultsSetToFalse() throws
17521752
String remoteIndex = (String) testClusterInfo.get("remote.index");
17531753

17541754
SearchListenerPlugin.blockLocalQueryPhase();
1755+
SearchListenerPlugin.blockRemoteQueryPhase();
17551756

17561757
TimeValue searchTimeout = new TimeValue(100, TimeUnit.MILLISECONDS);
17571758
// query builder that will sleep for the specified amount of time in the query phase
@@ -1810,6 +1811,7 @@ public void testCancellationViaTimeoutWithAllowPartialResultsSetToFalse() throws
18101811

18111812
} finally {
18121813
SearchListenerPlugin.allowLocalQueryPhase();
1814+
SearchListenerPlugin.allowRemoteQueryPhase();
18131815
}
18141816

18151817
// query phase has begun, so wait for query failure (due to timeout)
@@ -1927,7 +1929,7 @@ private Map<String, Object> setupTwoClusters() {
19271929
String remoteIndex = "remote";
19281930
int numShardsRemote = randomIntBetween(2, 12);
19291931
final InternalTestCluster remoteCluster = cluster(REMOTE_CLUSTER);
1930-
remoteCluster.ensureAtLeastNumDataNodes(randomIntBetween(1, 3));
1932+
remoteCluster.ensureAtLeastNumDataNodes(5);//randomIntBetween(1, 3));
19311933
final Settings.Builder remoteSettings = Settings.builder();
19321934
remoteSettings.put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, numShardsRemote);
19331935
remoteSettings.put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, randomIntBetween(0, 1));

0 commit comments

Comments
 (0)