Skip to content

Cancel expired async search task when a remote returns its results #126583

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 5 commits into from
Apr 16, 2025
Merged

Cancel expired async search task when a remote returns its results #126583

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
51a6283
Cancel expired async search task when a remote returns its results
javanna Apr 10, 2025
ddaa572
Update docs/changelog/126583.yaml
javanna Apr 10, 2025
52abf38
iter
javanna Apr 10, 2025
7ebb320
Merge branch 'main' into fix/cancel_task_async_search_minimize_roundt…
javanna Apr 14, 2025
328d30d
Merge branch 'main' into fix/cancel_task_async_search_minimize_roundt…
javanna Apr 15, 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
8 changes: 4 additions & 4 deletions ...ternalClusterTest/java/org/elasticsearch/xpack/search/CCSUsageTelemetryAsyncSearchIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ public void resetSearchListenerPlugin() {
}

private SubmitAsyncSearchRequest makeSearchRequest(String... indices) {
CrossClusterAsyncSearchIT.SearchListenerPlugin.blockQueryPhase();
CrossClusterAsyncSearchIT.SearchListenerPlugin.blockLocalQueryPhase();

SubmitAsyncSearchRequest request = new SubmitAsyncSearchRequest(indices);
request.setCcsMinimizeRoundtrips(randomBoolean());
Expand Down Expand Up @@ -220,7 +220,7 @@ public void testCancelledSearch() throws Exception {
String remoteIndex = (String) testClusterInfo.get("remote.index");

SubmitAsyncSearchRequest searchRequest = makeSearchRequest(localIndex, REMOTE1 + ":" + remoteIndex);
CrossClusterAsyncSearchIT.SearchListenerPlugin.blockQueryPhase();
CrossClusterAsyncSearchIT.SearchListenerPlugin.blockLocalQueryPhase();

String nodeName = cluster(LOCAL_CLUSTER).getRandomNodeName();
final AsyncSearchResponse response = cluster(LOCAL_CLUSTER).client(nodeName)
Expand All @@ -232,7 +232,7 @@ public void testCancelledSearch() throws Exception {
response.decRef();
assertTrue(response.isRunning());
}
CrossClusterAsyncSearchIT.SearchListenerPlugin.waitSearchStarted();
CrossClusterAsyncSearchIT.SearchListenerPlugin.waitLocalSearchStarted();

ActionFuture<ListTasksResponse> cancelFuture;
try {
Expand Down Expand Up @@ -290,7 +290,7 @@ public void testCancelledSearch() throws Exception {
assertTrue(taskInfo.description(), taskInfo.cancelled());
}
} finally {
CrossClusterAsyncSearchIT.SearchListenerPlugin.allowQueryPhase();
CrossClusterAsyncSearchIT.SearchListenerPlugin.allowLocalQueryPhase();
}

assertBusy(() -> assertTrue(cancelFuture.isDone()));
Expand Down
Loading