-
Notifications
You must be signed in to change notification settings - Fork 24.9k
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
Fix scroll contexts counter in SearchService #71354
Merged
Merged
Conversation
This file contains 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
dnhatn
added
:Search/Search
Search-related issues that do not fall into other categories
v6.8.16
labels
Apr 6, 2021
Pinging @elastic/es-search (Team:Search) |
dnhatn
force-pushed
the
6.8-fix-scroll-context
branch
from
April 6, 2021 15:47
e18254f
to
251549b
Compare
jimczi
approved these changes
Apr 7, 2021
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
server/src/main/java/org/elasticsearch/search/SearchService.java
Outdated
Show resolved
Hide resolved
Co-authored-by: Jim Ferenczi <[email protected]>
Thanks Jim! |
dnhatn
added a commit
to dnhatn/elasticsearch
that referenced
this pull request
Apr 7, 2021
These assertions are introduced in elastic#71354
This was referenced Apr 7, 2021
dnhatn
added a commit
that referenced
this pull request
Apr 7, 2021
These assertions are introduced in #71354
dnhatn
added a commit
that referenced
this pull request
Apr 7, 2021
These assertions are introduced in #71354
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
>bug
:Search/Search
Search-related issues that do not fall into other categories
Team:Search
Meta label for search team
v6.8.16
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.
Unfortunately, the backport of #53449 to 6.8 and 7.6.2 weren't correct. The scroll context counter can be negative even become
Integer.MAX_VALUE
after handling many search requests. This bug causes two issues:This bug was already fixed in 7.7 and later. I will add the assertions in this PR to 7.x and master.
Kudos to @jerryjune for this finding.
Closes #56202