per tenant retention #116
Merged
per tenant retention #116
+361
−0
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
jnyi
commented
Dec 17, 2024
| } | ||
|
|
||
| // ApplyRetentionPolicyByTenant removes blocks depending on the specified retentionByTenant based on blocks MaxTime. | ||
| func ApplyRetentionPolicyByTenant( |
There was a problem hiding this comment.
plan to add unit test for this as well
hczhu-db
approved these changes
Dec 17, 2024
cmd/thanos/compact.go
Outdated
| @@ -436,6 +436,12 @@ func runCompact( | |||
| level.Info(logger).Log("msg", "retention policy of 1 hour aggregated samples is enabled", "duration", retentionByResolution[compact.ResolutionLevel1h]) | |||
| } | |||
|
|
|||
| retentionByTenant, err := compact.ParesRetentionPolicyByTenant(logger, *conf.retentionTenants) | |||
| if err != nil && len(retentionByTenant) != 0 { | |||
There was a problem hiding this comment.
Why is len(retentionByTenant) != 0 needed here? If it's an empty config, err should already be nil.
| "github.com/thanos-io/objstore" | ||
|
|
||
| "github.com/thanos-io/thanos/pkg/block" | ||
| "github.com/thanos-io/thanos/pkg/block/metadata" | ||
| ) | ||
|
|
||
| const ( | ||
| tenantRetentionRegex = `^([\w-]+):((\d{4}-\d{2}-\d{2})|(\d+d))$` |
There was a problem hiding this comment.
Give some examples in a piece of code comment.
There was a problem hiding this comment.
examples in unit tests already
pkg/compact/retention.go
Outdated
Comment on lines
85
to
87
| } else if matches[3] != "" { | ||
| policy.CutoffDate = cutoffDate | ||
| } |
There was a problem hiding this comment.
nit: don't need else if{} because the function returns in if{}.
There was a problem hiding this comment.
still need this, matches[3] can be empty, we allow optional cutoffDate or a retention duration
pkg/compact/retention.go
Outdated
Comment on lines
90
to
92
| } else if matches[4] != "" { | ||
| policy.RetentionDuration = time.Duration(duration) | ||
| } |
jnyi
force-pushed
the
pantheon-compactor-backlog
branch
from
c106c13 to
d2bd5b4
Compare
Signed-off-by: Yi Jin <[email protected]>
jnyi
force-pushed
the
pantheon-compactor-backlog
branch
from
d2bd5b4 to
c3c1e59
Compare
Signed-off-by: Yi Jin <[email protected]>
jnyi
force-pushed
the
pantheon-compactor-backlog
branch
from
56f4716 to
2cc4540
Compare
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.
Changes
Verification