Replicate can specify blocks to copy #3388
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
yeya24
force-pushed
the
replicate-block-id
branch
from
5e3289c to
76c27f5
Compare
bwplotka
reviewed
Nov 12, 2020
cmd/thanos/tools_bucket.go
Outdated
| @@ -446,6 +446,8 @@ func registerBucketReplicate(app extkingpin.AppClause, objStoreConfig *extflag.P | |||
| Default("0000-01-01T00:00:00Z")) | |||
| maxTime := model.TimeOrDuration(cmd.Flag("max-time", "End of time range limit to replicate. Thanos Replicate will replicate only metrics, which happened earlier than this value. Option can be a constant time in RFC3339 format or time duration relative to current time, such as -1d or 2h45m. Valid duration units are ms, s, m, h, d, w, y."). | |||
| Default("9999-12-31T23:59:59Z")) | |||
| ids := cmd.Flag("id", "Block to be replicated to the destination bucket. If this is specified, then only "+ | |||
| "IDs will be used to match blocks and other matchers will be ignored. It only runs once. Repeated field").Strings() | |||
There was a problem hiding this comment.
Suggested change
| "IDs will be used to match blocks and other matchers will be ignored. It only runs once. Repeated field").Strings() | |
| "IDs will be used to match blocks and other matchers will be ignored. When specified, this command will be run only once after successful replication. Repeated field").Strings() |
pkg/replicate/replicator.go
Outdated
| @@ -83,6 +83,7 @@ func RunReplicate( | |||
| toObjStoreConfig *extflag.PathOrContent, | |||
| singleRun bool, | |||
| minTime, maxTime *thanosmodel.TimeOrDurationValue, | |||
| blockIDs []string, | |||
pkg/replicate/scheme.go
Outdated
| if _, ok := bf.blockIDs[id]; ok { | ||
| return true | ||
| } | ||
| level.Debug(bf.logger).Log("msg", "filtering block", "reason", "block ID doesn't match", "block_uuid", id) |
There was a problem hiding this comment.
This will spam a lot. Maybe we can just not do log it?
pkg/replicate/scheme.go
Outdated
| @@ -49,11 +51,16 @@ func NewBlockFilter( | |||
| for _, compactionLevel := range compactionLevels { | |||
| allowedCompactions[compactionLevel] = struct{}{} | |||
| } | |||
| blockSet := make(map[string]struct{}) | |||
There was a problem hiding this comment.
The blockID list will be super short. Can we just loop over it instead of using map? Might be simpler (:
yeya24
force-pushed
the
replicate-block-id
branch
from
76c27f5 to
4a5af18
Compare
|
@bwplotka Updated, please take a look again! |
bwplotka
approved these changes
Nov 12, 2020
cmd/thanos/tools_bucket.go
Outdated
| for _, id := range *ids { | ||
| if bid, err := ulid.Parse(id); err != nil { | ||
| return errors.Wrap(err, "invalid ULID found in --id flag") | ||
| } else { |
pkg/compactv2/modifiers_test.go
Outdated
| "testing" | ||
| ) | ||
|
|
||
| func TestIntersection(t *testing.T) { |
There was a problem hiding this comment.
Sorry, will remove this.
|
Updated again. |
yeya24
force-pushed
the
replicate-block-id
branch
from
29a0f89 to
8899580
Compare
yeya24
force-pushed
the
replicate-block-id
branch
from
8899580 to
e8b3656
Compare
Rebased, PTAL |
GiedriusS
approved these changes
Nov 24, 2020
yeya24
force-pushed
the
replicate-block-id
branch
from
e8b3656 to
b22170c
Compare
|
Done. PTAL again. |
Signed-off-by: Ben Ye <[email protected]>
Signed-off-by: Ben Ye <[email protected]>
Signed-off-by: Ben Ye <[email protected]>
Signed-off-by: Ben Ye <[email protected]>
Signed-off-by: Ben Ye <[email protected]>
Signed-off-by: Ben Ye <[email protected]>
yeya24
force-pushed
the
replicate-block-id
branch
from
b22170c to
c2ae9a0
Compare
|
Just rebased this pr. PTAL again, thanks! |
|
I will merge this since there are already two approvals! |
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.
Signed-off-by: Ben Ye [email protected]
Changes
Fixes #2713
Added a repeated flag
--idto specify the blocks to replicate.Verification