Update memberlist/use grafana fork#1410
Merged
joe-elliott merged 2 commits intografana:mainfrom Apr 25, 2022
Merged
Conversation
Signed-off-by: Joe Elliott <number101010@gmail.com>
joe-elliott
requested review from
annanay25,
dgzlopes,
mapno,
mdisibio,
yvrhdn and
zalegrala
as code owners
Signed-off-by: Joe Elliott <number101010@gmail.com>
zalegrala
approved these changes
Apr 25, 2022
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
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