Skip to content

Commit 3bb1eb7

Browse files
authored
Block remote query search too in testCancellationViaTimeoutWithAllowPartialResultsSetToFalse (elastic#134236) (elastic#134247)
* Block remote query search too (cherry picked from commit 9f4262b) # Conflicts: # muted-tests.yml
1 parent 92c4061 commit 3bb1eb7

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

muted-tests.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -440,9 +440,6 @@ tests:
440440
- class: org.elasticsearch.xpack.search.CrossClusterAsyncSearchIT
441441
method: testCancelViaExpirationOnRemoteResultsWithMinimizeRoundtrips
442442
issue: https://github.com/elastic/elasticsearch/issues/127302
443-
- class: org.elasticsearch.xpack.search.CrossClusterAsyncSearchIT
444-
method: testCancellationViaTimeoutWithAllowPartialResultsSetToFalse
445-
issue: https://github.com/elastic/elasticsearch/issues/131248
446443
- class: org.elasticsearch.xpack.kql.parser.KqlParserBooleanQueryTests
447444
method: testParseAndQuery
448445
issue: https://github.com/elastic/elasticsearch/issues/133871

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

Lines changed: 2 additions & 0 deletions
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)

0 commit comments

Comments
 (0)