-
Notifications
You must be signed in to change notification settings - Fork 1.8k
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.
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
Add early termination support for concurrent segment search #8306
Conversation
...rc/internalClusterTest/java/org/opensearch/search/ConcurrentSegmentSearchCancellationIT.java
Show resolved
Hide resolved
Gradle Check (Jenkins) Run Completed with:
|
server/src/internalClusterTest/java/org/opensearch/search/SearchCancellationIT.java
Outdated
Show resolved
Hide resolved
917dc38
to
90a37b8
Compare
Gradle Check (Jenkins) Run Completed with:
|
90a37b8
to
0173f13
Compare
Gradle Check (Jenkins) Run Completed with:
|
server/src/main/java/org/opensearch/search/query/ConcurrentQueryPhaseSearcher.java
Outdated
Show resolved
Hide resolved
server/src/main/java/org/opensearch/search/query/ConcurrentQueryPhaseSearcher.java
Outdated
Show resolved
Hide resolved
1bc3857
to
819f20f
Compare
server/src/main/java/org/opensearch/search/query/ConcurrentQueryPhaseSearcher.java
Show resolved
Hide resolved
server/src/main/java/org/opensearch/search/internal/ContextIndexSearcher.java
Show resolved
Hide resolved
819f20f
to
bcda9fb
Compare
Gradle Check (Jenkins) Run Completed with:
|
Test failures look unrelated but I'll rebase the branch and rerun the tests |
Signed-off-by: Jay Deng <[email protected]>
bcda9fb
to
5fa3ba7
Compare
Gradle Check (Jenkins) Run Completed with:
|
Gradle Check (Jenkins) Run Completed with:
|
Looks like all the tests pass after rebasing, @reta I think we're good to merge then if no other comments. Thanks! |
The backport to
To backport manually, run these commands in your terminal: # Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/backport-2.x
# Create a new branch
git switch --create backport/backport-8306-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 31e67c17ecc6eb70d28e991b13085411e961b5bd
# Push it to GitHub
git push --set-upstream origin backport/backport-8306-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/backport-2.x Then, create a pull request where the |
@jed326 sadly 2.x needs manual backport, could you please take care of it? thank you |
…ch-project#8306) Signed-off-by: Jay Deng <[email protected]>
…8537) Signed-off-by: Jay Deng <[email protected]>
…ch-project#8306) Signed-off-by: Jay Deng <[email protected]>
…ch-project#8306) Signed-off-by: Jay Deng <[email protected]>
…ch-project#8306) Signed-off-by: Jay Deng <[email protected]>
…ch-project#8306) Signed-off-by: Jay Deng <[email protected]> Signed-off-by: sahil buddharaju <[email protected]>
…ch-project#8306) Signed-off-by: Jay Deng <[email protected]>
…ch-project#8306) Signed-off-by: Jay Deng <[email protected]> Signed-off-by: Shivansh Arora <[email protected]>
Description
This PR adds support for partial results in the cases of timeouts for concurrent segment search.
"Full" partial results are not supported for early terminations because shard failures are expected in that case and thus the behavior between concurrent and non-concurrent search is already consistent. See #817 for more details.
We achieve this by swallowing the timeout exception in the
ContextIndexSearcher.searchLeaf
method and forces us to finish processing all of the leaves in both the sequential and concurrent cases.Related Issues
Resolves #2586
Check List
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.