Fix creation of already pruned tenants #5655
Merged
Conversation
This file contains 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
fpetkovski
force-pushed
the
tenant-metrics-registration
branch
2 times, most recently
from
3aea6b9
to
0a65192
Compare
When a tenant is pruned from a Receiver, its metrics will remain in the shipper's Prometheus registry. This leads to a panic when the same tenant is created again in the Receiver since multiTSDB will attempt to the same metrics again. The current solution for the TSDB metrics is to wrap the registry in an UnRegisterer which can deregister metrics with the same name before registering new metrics. This commit applies the same solution to the shipper metrics. Signed-off-by: Filip Petkovski <filip.petkovsky@gmail.com>
fpetkovski
force-pushed
the
tenant-metrics-registration
branch
from
0a65192
to
cc1c20f
Compare
fpetkovski
commented
Aug 29, 2022
| @@ -446,7 +448,7 @@ func (t *MultiTSDB) startTSDB(logger log.Logger, tenantID string, tenant *tenant | |||
| s, err := tsdb.Open( | |||
| dataDir, | |||
| logger, | |||
| &UnRegisterer{Registerer: reg}, | |||
| reg, | |||
There was a problem hiding this comment.
Issue was happening because we did not have an UnRegisterer here
prajain12
pushed a commit
to prajain12/thanos
that referenced
this pull request
Sep 6, 2022
When a tenant is pruned from a Receiver, its metrics will remain in the shipper's Prometheus registry. This leads to a panic when the same tenant is created again in the Receiver since multiTSDB will attempt to the same metrics again. The current solution for the TSDB metrics is to wrap the registry in an UnRegisterer which can deregister metrics with the same name before registering new metrics. This commit applies the same solution to the shipper metrics. Signed-off-by: Filip Petkovski <filip.petkovsky@gmail.com> Signed-off-by: Filip Petkovski <filip.petkovsky@gmail.com> Signed-off-by: Prakul Jain <prakul.jain@udaan.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
When a tenant is pruned from a Receiver, its metrics will remain in
the shipper's Prometheus registry. This leads to a panic when the same
tenant is created again in the Receiver since multiTSDB will attempt to register
the same same metrics again.
The current solution for the TSDB metrics is to wrap the registry in
an UnRegisterer which can deregister metrics with the same name before
registering new metrics. This commit applies the same solution to the
shipper metrics.
Fixes #5626
Signed-off-by: Filip Petkovski filip.petkovsky@gmail.com
Changes
Verification
Verified with unit tests and some manual local testing.