Skip to content
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 3 commits into from
Apr 7, 2021

Conversation

dnhatn
Copy link
Member

@dnhatn dnhatn commented Apr 6, 2021

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:

  • Disable the limit of open scroll contexts when the counter is negative
  • Prevent opening new scroll contexts when the counter is greater than the limit of open scroll contexts

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

@dnhatn dnhatn added :Search/Search Search-related issues that do not fall into other categories v6.8.16 labels Apr 6, 2021
@dnhatn dnhatn requested a review from jimczi April 6, 2021 15:31
@elasticmachine elasticmachine added the Team:Search Meta label for search team label Apr 6, 2021
@elasticmachine
Copy link
Collaborator

Pinging @elastic/es-search (Team:Search)

@dnhatn dnhatn force-pushed the 6.8-fix-scroll-context branch from e18254f to 251549b Compare April 6, 2021 15:47
Copy link
Contributor

@jimczi jimczi left a comment

Choose a reason for hiding this comment

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

LGTM

@dnhatn
Copy link
Member Author

dnhatn commented Apr 7, 2021

Thanks Jim!

@dnhatn dnhatn merged commit f14e5f4 into elastic:6.8 Apr 7, 2021
@dnhatn dnhatn deleted the 6.8-fix-scroll-context branch April 7, 2021 14:56
dnhatn added a commit to dnhatn/elasticsearch that referenced this pull request Apr 7, 2021
dnhatn added a commit that referenced this pull request Apr 7, 2021
dnhatn added a commit that referenced this pull request Apr 7, 2021
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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants