Skip to content
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

Jump to bottom

Fix testCancelFailedSearchWhenPartialResultDisallowed #64248

Merged
merged 1 commit into from
Oct 28, 2020
Merged

Fix testCancelFailedSearchWhenPartialResultDisallowed #64248

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 6 additions & 3 deletions server/src/internalClusterTest/java/org/elasticsearch/search/SearchCancellationIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,6 @@ public void testCancelMultiSearch() throws Exception {
}
}

@AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/63976")
public void testCancelFailedSearchWhenPartialResultDisallowed() throws Exception {
final List<ScriptedBlockPlugin> plugins = initBlockFactory();
int numberOfShards = between(2, 5);
Expand Down Expand Up @@ -325,8 +324,12 @@ public void testCancelFailedSearchWhenPartialResultDisallowed() throws Exception
queryLatch.countDown();
assertBusy(() -> {
final List<SearchTask> searchTasks = getSearchTasks();
assertThat(searchTasks, hasSize(1));
assertTrue(searchTasks.get(0).isCancelled());
// The search request can complete before the "cancelledLatch" is latched if the second shard request is sent
// after the request was cancelled (i.e., the child task is not allowed to start after the parent was cancelled).
if (searchTasks.isEmpty() == false) {
assertThat(searchTasks, hasSize(1));
assertTrue(searchTasks.get(0).isCancelled());
}
}, 30, TimeUnit.SECONDS);
} finally {
for (ScriptedBlockPlugin plugin : plugins) {
Expand Down