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.

Sign up for GitHub

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

Jump to bottom

Only count ingesters with tokens when calculating local limits #7881

Merged
merged 4 commits into from
Apr 11, 2024
Merged

Only count ingesters with tokens when calculating local limits #7881

merged 4 commits into from
Apr 11, 2024

Conversation

pr00se
Copy link
Contributor

@pr00se pr00se commented Apr 11, 2024

What this PR does

Which issue(s) this PR fixes or relates to

Fixes #7847

Checklist

  • Tests updated.
  • Documentation added.
  • CHANGELOG.md updated - the order of entries should be [CHANGE], [FEATURE], [ENHANCEMENT], [BUGFIX].
  • about-versioning.md updated with experimental features.

@pr00se pr00se requested review from grafanabot and a team as code owners April 11, 2024 16:55
@pr00se pr00se changed the title Gh7847 Only count ingesters with tokens when calculating local limits Apr 11, 2024
56quarters
56quarters approved these changes Apr 11, 2024
View reviewed changes
Copy link
Contributor

@56quarters 56quarters left a comment

Choose a reason for hiding this comment

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

LGTM

@pr00se pr00se merged commit 213e3b9 into main Apr 11, 2024
29 of 31 checks passed
@pr00se pr00se deleted the gh7847 branch April 11, 2024 17:37
grafanabot pushed a commit that referenced this pull request Apr 11, 2024
@pr00se @grafanabot
Only count ingesters with tokens when calculating local limits (#7881)
3c72b26 
* Update dskit

* Switch limiter to use WithTokens instance count functions

* Add test

* Update CHANGELOG

(cherry picked from commit 213e3b9)
@grafanabot grafanabot mentioned this pull request Apr 11, 2024
Merged
pr00se added a commit that referenced this pull request Apr 11, 2024
@grafanabot @pr00se
Only count ingesters with tokens when calculating local limits (#7881) (
aef4dab 
#7884)

* Update dskit

* Switch limiter to use WithTokens instance count functions

* Add test

* Update CHANGELOG

(cherry picked from commit 213e3b9)

Co-authored-by: Patryk Prus <patryk@grafana.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@56quarters 56quarters 56quarters approved these changes

@grafanabot grafanabot Awaiting requested review from grafanabot grafanabot is a code owner

Assignees
No one assigned
Labels
backport r285 component/ingester
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Mismatch between ingester limiter and owned series when new ingesters are PENDING with no tokens
2 participants
@pr00se @56quarters