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

Unable spread minimizing token generation when tokens file path is set #5324

Merged
merged 4 commits into from
Jun 23, 2023

Conversation

duricanikolic
Copy link
Contributor

What this PR does

This PR adds an additional check in ingester's RingConfig.Validate() that implies that spread minimizing token generation strategy can be used only when tokens file path is set to an empty set. More precisely, the following configuration is required:

  'ingester.ring.token-generation-startegy': 'spread-minimizing'
  'ingester.ring.tokens-file-path': ''

Which issue(s) this PR fixes or relates to

Part of #4736

Checklist

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

Copy link
Collaborator

@pracucci pracucci left a comment

Choose a reason for hiding this comment

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

LGTM (modulo a couple of nits)

pkg/ingester/ingester_ring.go Outdated Show resolved Hide resolved
pkg/ingester/ingester_ring.go Outdated Show resolved Hide resolved
Copy link
Collaborator

@pracucci pracucci left a comment

Choose a reason for hiding this comment

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

LGTM (modulo a couple of nits to clarify the CLI flag)

CHANGELOG.md Outdated Show resolved Hide resolved
pkg/ingester/ingester_ring.go Outdated Show resolved Hide resolved
Copy link
Collaborator

@pracucci pracucci left a comment

Choose a reason for hiding this comment

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

I pushed a nit to fix the CLI flag prefix d149cc3.

@pracucci pracucci enabled auto-merge (squash) June 23, 2023 13:38
duricanikolic and others added 4 commits June 23, 2023 15:43
Signed-off-by: Yuri Nikolic <durica.nikolic@grafana.com>
Signed-off-by: Yuri Nikolic <durica.nikolic@grafana.com>
Signed-off-by: Yuri Nikolic <durica.nikolic@grafana.com>
Signed-off-by: Marco Pracucci <marco@pracucci.com>
@pracucci pracucci merged commit 70f1b7d into main Jun 23, 2023
@pracucci pracucci deleted the yuri/spread-minimizing-tg branch June 23, 2023 13:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants