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

Non-ingesters should not fail on its config validation #7990

Merged
merged 5 commits into from
Apr 30, 2024

Conversation

narqo
Copy link
Contributor

@narqo narqo commented Apr 28, 2024

What this PR does

These changes fix an issue with mimir's config validation, where non-ingester modules fail on its config validation, when -ingester.ring.token-generation-strategy=spread-minimizing is set.

Which issue(s) this PR fixes or relates to

Fixes #7822

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.

@narqo narqo requested a review from a team as a code owner April 28, 2024 13:49
Copy link
Contributor

@lamida lamida left a comment

Choose a reason for hiding this comment

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

Added a comment about test, but in general LGTM.

pkg/mimir/mimir_test.go Outdated Show resolved Hide resolved
@narqo narqo force-pushed the 7822-ingester-config-validation branch 2 times, most recently from 0b312bf to a5f39a6 Compare April 29, 2024 12:26
Copy link
Contributor

@dimitarvdimitrov dimitarvdimitrov left a comment

Choose a reason for hiding this comment

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

LGTM! There's a conflict in the changelog. Can you resolve that and I can merge the PR?

Thanks for the cleanup btw :)

if c.isAnyModuleEnabled(Ingester, Write, All) || !errors.Is(err, ingester.ErrSpreadMinimizingValidation) {
return errors.Wrap(err, "invalid ingester config")
}
level.Warn(log).Log("ingester config is invalid; moving on because the \"ingester\" module is not in this process's targets", "err", err.Error())
Copy link
Contributor

Choose a reason for hiding this comment

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

i'd opt for a debug log here. It shouldn't be anything to worry about. WDYT?

Signed-off-by: Vladimir Varankin <vladimir.varankin@grafana.com>
Signed-off-by: Vladimir Varankin <vladimir.varankin@grafana.com>
@narqo narqo force-pushed the 7822-ingester-config-validation branch from a5f39a6 to b9ebb43 Compare April 30, 2024 10:56
…g validation

Signed-off-by: Vladimir Varankin <vladimir.varankin@grafana.com>
Signed-off-by: Vladimir Varankin <vladimir.varankin@grafana.com>
Signed-off-by: Vladimir Varankin <vladimir.varankin@grafana.com>
@narqo narqo force-pushed the 7822-ingester-config-validation branch from b9ebb43 to 2a36e8e Compare April 30, 2024 11:30
@dimitarvdimitrov dimitarvdimitrov merged commit c55ed05 into main Apr 30, 2024
29 checks passed
@dimitarvdimitrov dimitarvdimitrov deleted the 7822-ingester-config-validation branch April 30, 2024 12:38
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.

Non-ingesters fail to validate config with spread-minimizing token generation strategy
3 participants