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

[release-2.9.x] Ruler: catering for another data race in tenant config #11714

Merged
merged 1 commit into from
Jan 19, 2024

Conversation

grafanabot
Copy link
Collaborator

Backport 61a4205 from #11612


Expands on #11601

What this PR does / why we need it:
Turns out the previous tests didn't expose all possible causes for data races (another one occurs at

if rwCfg.Clients[id].Headers == nil {
).
Moving the mutex to the calling function adds more safety.

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

Expands on #11601

**What this PR does / why we need it**:
Turns out the previous tests didn't expose all possible causes for data
races (another one occurs at
https://github.com/grafana/loki/blob/5a55158cc751465846383bc758aa0c169363b292/pkg/ruler/registry.go#L204).
Moving the mutex to the calling function adds more safety.

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

Signed-off-by: Danny Kopping <danny.kopping@grafana.com>
(cherry picked from commit 61a4205)
@grafanabot grafanabot requested a review from a team as a code owner January 19, 2024 09:22
@grafanabot grafanabot added backport size/XS type/bug Somehing is not working as expected labels Jan 19, 2024
@dannykopping dannykopping merged commit 94f97fb into release-2.9.x Jan 19, 2024
10 checks passed
@dannykopping dannykopping deleted the backport-11612-to-release-2.9.x branch January 19, 2024 09:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport size/XS type/bug Somehing is not working as expected
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants