Rework cancellation test for batched query execution #133579
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
benchaplin
added
>test
|
Pinging @elastic/es-search-foundations (Team:Search Foundations) |
benchaplin
commented
Aug 26, 2025
| public void onNewReaderContext(ReaderContext c) { | ||
| if (runOnNewReaderContext.get() != null) { | ||
| runOnNewReaderContext.get().accept(c); | ||
| public void onPreQueryPhase(SearchContext c) { |
There was a problem hiding this comment.
I made this change because SearchContext gave me easier access to the node ID.
Both the onNewReaderContext and onPreQueryPhase hooks run before query execution begins, so either will do the job for this test (the only user of SearchShardBlockingPlugin).
javanna
approved these changes
Aug 27, 2025
There was a problem hiding this comment.
LGTM, I am only wondering whether we should keep the old test and still run it without batched execution, maybe that's overkill, up to you @benchaplin
|
Good shout. I suppose the batched setting will be available for users to disable, so I think we should keep the old test. I've randomized the setting. |
💚 Backport successful
|
benchaplin
added a commit
to benchaplin/elasticsearch
that referenced
this pull request
Aug 28, 2025
6 tasks
elasticsearchmachine
pushed a commit
that referenced
this pull request
Aug 28, 2025
JeremyDahlgren
pushed a commit
to JeremyDahlgren/elasticsearch
that referenced
this pull request
Aug 29, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Before this PR: this test makes a search request with allow_partial_search_results=false then manipulates the execution:
Batched query execution handles cancellations in a slightly worse manner. Instead of retrying (or failing if there are no replicas) immediately, batched queries must wait for all shards in the batch to complete. Then the data node responds to the coordinating node with the batch result, which handles shard failures. Therefore, this test doesn't work for batched, because if only one shard is allowed to proceed and it's part of a batched request, the batch will never complete.
After this PR: this test makes a search request with allow_partial_search_results=false then manipulates the execution: