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

Deprecate readiness-check-ring-health config option #4422

Merged
merged 1 commit into from
Mar 9, 2023
Merged

Conversation

ying-jeanne
Copy link
Contributor

@ying-jeanne ying-jeanne commented Mar 8, 2023

What this PR does

Which issue(s) this PR fixes or relates to

Fixes #4181

Checklist

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

CHANGELOG.md Outdated Show resolved Hide resolved
@@ -119,7 +125,7 @@ func (cfg *RingConfig) ToRingConfig() ring.Config {

// ToLifecyclerConfig returns a ring.LifecyclerConfig based on the ingester
// ring config.
func (cfg *RingConfig) ToLifecyclerConfig() ring.LifecyclerConfig {
func (cfg *RingConfig) ToLifecyclerConfig(logger log.Logger) ring.LifecyclerConfig {
Copy link
Contributor Author

Choose a reason for hiding this comment

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

I have put the check in this method since it is where the flag is consumed, Another way is to implement a validate method of RingConfig, and call it from mimir.go

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.

Thanks for working on this! I just left a couple of minor comments.

CHANGELOG.md Outdated Show resolved Hide resolved
CHANGELOG.md Outdated Show resolved Hide resolved
pkg/mimir/mimir.go Outdated Show resolved Hide resolved
pkg/ingester/ingester_ring.go Outdated Show resolved Hide resolved
@ying-jeanne ying-jeanne force-pushed the readinesscheck branch 3 times, most recently from a8d6b78 to 9f4103b Compare March 8, 2023 20:28
@ying-jeanne ying-jeanne marked this pull request as ready for review March 8, 2023 20:42
@ying-jeanne ying-jeanne requested review from a team as code owners March 8, 2023 20:42
@pstibrany
Copy link
Member

The CHANGELOG has just been cut to prepare for the next Mimir release. Please rebase main and eventually move the CHANGELOG entry added / updated in this PR to the top of the CHANGELOG document. Thanks!

CHANGELOG.md Outdated
@@ -4,6 +4,7 @@

### Grafana Mimir

* [CHANGE] Ingester: the configuration parameter `-ingester.ring.readiness-check-ring-health` has been deprecated and will be removed in Mimir 2.9. #4422
Copy link
Collaborator

Choose a reason for hiding this comment

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

Contrary to what automatically commented, don't move it outside of 2.7 CHANGELOG because we want to cherry-pick this PR in release 2.7. Just rebase it, please.

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! Please don't move the CHANGELOG entry outside of 2.7 CHANGELOG because we want to cherry-pick this PR in release 2.7, but please rebase it so we can merge. Thanks!

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.

Thanks!

@pracucci pracucci enabled auto-merge (squash) March 9, 2023 10:18
@pracucci pracucci merged commit 9e8e46a into main Mar 9, 2023
@pracucci pracucci deleted the readinesscheck branch March 9, 2023 10:20
grafanabot pushed a commit that referenced this pull request Mar 9, 2023
@pracucci pracucci mentioned this pull request Mar 9, 2023
aldernero pushed a commit that referenced this pull request Mar 9, 2023
(cherry picked from commit 9e8e46a)

Co-authored-by: ying-jeanne <74549700+ying-jeanne@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Deprecate -ingester.ring.readiness-check-ring-health
3 participants