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: protect ruler remote-write overrides map with a mutex when creating new appenders #13676

Merged
merged 1 commit into from
Jul 30, 2024

Conversation

verejoel
Copy link
Contributor

@verejoel verejoel commented Jul 26, 2024

What this PR does / why we need it:
This fixes an additional data race identified when creating new appenders in a ruler handling many hundreds of rules.

Which issue(s) this PR fixes:
Fixes #11569

Special notes for your reviewer: It's not possible to defer the unlock in the Appender function, as we access the registry later when update the tenant configuration. Therefore we just put the guard around the singular operation when we access the remote write config.

Checklist

  • Reviewed the CONTRIBUTING.md guide (required)
  • Documentation added
  • Tests updated
  • Title matches the required conventional commits format, see here
    • Note that Promtail is considered to be feature complete, and future development for logs collection will be in Grafana Alloy. As such, feat PRs are unlikely to be accepted unless a case can be made for the feature actually being a bug fix to existing behavior.
  • Changes that require user attention or interaction to upgrade are documented in docs/sources/setup/upgrade/_index.md
  • For Helm chart changes bump the Helm chart version in production/helm/loki/Chart.yaml and update production/helm/loki/CHANGELOG.md and production/helm/loki/README.md. Example PR
  • If the change is deprecating or removing a configuration option, update the deprecated-config.yaml and deleted-config.yaml files respectively in the tools/deprecated-config-checker directory. Example PR

@verejoel verejoel requested a review from a team as a code owner July 26, 2024 10:25
@verejoel verejoel changed the title Ruler: protect overrides map with a mutex when creating a new appender fix: protect ruler remote-write overrides map with a mutex when creating new appenders Jul 26, 2024
@verejoel verejoel force-pushed the fix/ruler-appender-concurrent-access branch from 000d1c4 to 55e0d9d Compare July 26, 2024 10:38
@verejoel
Copy link
Contributor Author

@cstyan pinging you for a review :)

@cstyan
Copy link
Contributor

cstyan commented Jul 30, 2024

@verejoel thanks! before I merge, can you confirm that you're just seeing this when you have many rules configured? it's not that you have few rules but multiple remote write endpoints for that ruler/tenant?

@verejoel
Copy link
Contributor Author

verejoel commented Jul 30, 2024 via email

@cstyan
Copy link
Contributor

cstyan commented Jul 30, 2024

@verejoel cool, thank you 👍

@cstyan cstyan merged commit e9a9c60 into grafana:main Jul 30, 2024
61 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Loki Ruler: panic with 'fatal error: concurrent map read and map write'
2 participants