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

Update memberlist/use grafana fork #1410

Merged
merged 2 commits into from
Apr 25, 2022

Conversation

joe-elliott
Copy link
Member

@joe-elliott joe-elliott commented Apr 25, 2022

What this PR does:
Lately in Tempo we have seen OOMs with increasing frequency on our larger clusters when doing roll outs. These OOMs seem to have become even more likely when we added the metrics generator ring.

This PR uses a replace directive to catch two memory related fixes in the grafana memberlist fork. Once both of these PRs are merged upstream we can switch back to using the original repo:

This PR:
grafana/memberlist#1

Catches these two fixes (only one is merged):
hashicorp/memberlist#239
hashicorp/memberlist#260

Signed-off-by: Joe Elliott <number101010@gmail.com>
Signed-off-by: Joe Elliott <number101010@gmail.com>
@joe-elliott joe-elliott merged commit 66f70b9 into grafana:main Apr 25, 2022
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