Skip to content

Fix test - wait for other threads before throwing the exception #124386

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 3 commits into from
Mar 8, 2025
Merged

Fix test - wait for other threads before throwing the exception #124386

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f343920
Fix test - wait for other threads before throwing the exception
smalyshev Mar 7, 2025
a7e9c50
Merge branch 'main' into fix-121719
smalyshev Mar 8, 2025
33489ef
Merge branch 'main' into fix-121719
smalyshev Mar 8, 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
9 changes: 8 additions & 1 deletion 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 @@ -262,13 +262,17 @@ public void testCancelFailedSearchWhenPartialResultDisallowed() throws Exception
// When the search request executes, block all shards except 1.
final List<SearchShardBlockingPlugin> searchShardBlockingPlugins = initSearchShardBlockingPlugin();
AtomicBoolean letOneShardProceed = new AtomicBoolean();
Copy link
Contributor

@original-brownbear original-brownbear Mar 7, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe we could make this slightly simpler by using a nAtomicReference<CountDownLatch> and then doing something like latch = getAndSet(null); if (latch != null) latch.await to save a variable?

Copy link
Contributor Author

@smalyshev smalyshev Mar 8, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure I understood how it should work. I think it's better to check if this one works and then if it fixes the issues then we can refactor it.

// Ensure we have at least one task waiting on the latch
CountDownLatch waitingTaskLatch = new CountDownLatch(1);
CountDownLatch shardTaskLatch = new CountDownLatch(1);
for (SearchShardBlockingPlugin plugin : searchShardBlockingPlugins) {
plugin.setRunOnNewReaderContext((ReaderContext c) -> {
if (letOneShardProceed.compareAndSet(false, true)) {
// Let one shard continue.
} else {
safeAwait(shardTaskLatch, TimeValue.timeValueSeconds(30)); // Block the other shards.
// Signal that we have a task waiting on the latch
waitingTaskLatch.countDown();
safeAwait(shardTaskLatch); // Block the other shards.
}
});
}
Expand All @@ -280,6 +284,9 @@ public void testCancelFailedSearchWhenPartialResultDisallowed() throws Exception
plugin.disableBlock();
plugin.setBeforeExecution(() -> {
if (oneThreadWillError.compareAndSet(false, true)) {
// wait for some task to get to the latch
safeAwait(waitingTaskLatch);
// then throw the exception
throw new IllegalStateException("This will cancel the ContextIndexSearcher.search task");
}
});
Expand Down