Add early termination support for concurrent segment search#8306
Merged
reta merged 1 commit intoopensearch-project:mainfrom Jul 7, 2023
Merged
Add early termination support for concurrent segment search#8306reta merged 1 commit intoopensearch-project:mainfrom
reta merged 1 commit intoopensearch-project:mainfrom
Conversation
jed326
commented
Jun 28, 2023
...rc/internalClusterTest/java/org/opensearch/search/ConcurrentSegmentSearchCancellationIT.java
Show resolved
Hide resolved
Contributor
Gradle Check (Jenkins) Run Completed with:
|
jed326
commented
Jun 28, 2023
server/src/internalClusterTest/java/org/opensearch/search/SearchCancellationIT.java
Outdated
Show resolved
Hide resolved
917dc38 to
90a37b8
Compare
Contributor
Gradle Check (Jenkins) Run Completed with:
|
90a37b8 to
0173f13
Compare
Contributor
Gradle Check (Jenkins) Run Completed with:
|
Contributor
Author
Contributor
Author
reta
reviewed
Jul 7, 2023
server/src/main/java/org/opensearch/search/query/ConcurrentQueryPhaseSearcher.java
Outdated
Show resolved
Hide resolved
reta
reviewed
Jul 7, 2023
server/src/main/java/org/opensearch/search/query/ConcurrentQueryPhaseSearcher.java
Outdated
Show resolved
Hide resolved
1bc3857 to
819f20f
Compare
jed326
commented
Jul 7, 2023
server/src/main/java/org/opensearch/search/query/ConcurrentQueryPhaseSearcher.java
Show resolved
Hide resolved
reta
reviewed
Jul 7, 2023
server/src/main/java/org/opensearch/search/internal/ContextIndexSearcher.java
Show resolved
Hide resolved
819f20f to
bcda9fb
Compare
reta
approved these changes
Jul 7, 2023
Contributor
Gradle Check (Jenkins) Run Completed with:
|
Contributor
Author
|
Test failures look unrelated but I'll rebase the branch and rerun the tests |
Signed-off-by: Jay Deng <jayd0104@gmail.com>
bcda9fb to
5fa3ba7
Compare
Contributor
Gradle Check (Jenkins) Run Completed with:
|
sohami
approved these changes
Jul 7, 2023
Contributor
Gradle Check (Jenkins) Run Completed with:
|
Contributor
Author
|
Looks like all the tests pass after rebasing, @reta I think we're good to merge then if no other comments. Thanks! |
Contributor
|
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.xThen, create a pull request where the |
Contributor
|
@jed326 sadly 2.x needs manual backport, could you please take care of it? thank you |
jed326
added a commit
to jed326/OpenSearch
that referenced
this pull request
Jul 7, 2023
…ch-project#8306) Signed-off-by: Jay Deng <jayd0104@gmail.com>
6 tasks
reta
pushed a commit
that referenced
this pull request
Jul 8, 2023
vikasvb90
referenced
this pull request
in raghuvanshraj/OpenSearch
Jul 12, 2023
Signed-off-by: Jay Deng <jayd0104@gmail.com>
dzane17
pushed a commit
to dzane17/OpenSearch
that referenced
this pull request
Jul 12, 2023
…ch-project#8306) Signed-off-by: Jay Deng <jayd0104@gmail.com>
buddharajusahil
pushed a commit
to buddharajusahil/OpenSearch
that referenced
this pull request
Jul 18, 2023
…ch-project#8306) Signed-off-by: Jay Deng <jayd0104@gmail.com> Signed-off-by: sahil buddharaju <sahilbud@amazon.com>
baba-devv
pushed a commit
to baba-devv/OpenSearch
that referenced
this pull request
Jul 29, 2023
…ch-project#8306) Signed-off-by: Jay Deng <jayd0104@gmail.com>
shiv0408
pushed a commit
to Gaurav614/OpenSearch
that referenced
this pull request
Apr 25, 2024
…ch-project#8306) Signed-off-by: Jay Deng <jayd0104@gmail.com> Signed-off-by: Shivansh Arora <hishiv@amazon.com>
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.


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.searchLeafmethod 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.