tools bucket replicate: add support for concurrent bucket replication #5280
There are no files selected for viewing
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
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
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
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
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
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
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -11,9 +11,11 @@ import ( | |||||
| "io/ioutil" | ||||||
| "path" | ||||||
| "sort" | ||||||
| "sync" | ||||||
|
|
||||||
| "github.com/go-kit/log" | ||||||
| "github.com/go-kit/log/level" | ||||||
| "github.com/hashicorp/go-multierror" | ||||||
| "github.com/oklog/ulid" | ||||||
| "github.com/pkg/errors" | ||||||
| "github.com/prometheus/client_golang/prometheus" | ||||||
|
|
@@ -179,7 +181,7 @@ func newReplicationScheme( | |||||
| } | ||||||
| } | ||||||
|
|
||||||
| func (rs *replicationScheme) execute(ctx context.Context, concurrencyLvl int) error { | ||||||
| availableBlocks := []*metadata.Meta{} | ||||||
|
|
||||||
| metas, partials, err := rs.fetcher.Fetch(ctx) | ||||||
|
|
@@ -204,13 +206,44 @@ func (rs *replicationScheme) execute(ctx context.Context) error { | |||||
| return availableBlocks[i].BlockMeta.MinTime < availableBlocks[j].BlockMeta.MinTime | ||||||
| }) | ||||||
|
|
||||||
| // iterate over blocks and send them to a channel sequentially | ||||||
|
There was a problem hiding this comment. We use a full sentences in comments (nit).
Suggested change
There was a problem hiding this comment. yup, my bad, I'll fix it I wonder why this was not picked up by the linter, golangci-lint config includes godot: Line 36 in a6f6ce0 .godot.yaml with config appropriate to make it check all comments? (and probably fix lots and lots of comments across the code base)
|
||||||
| blocksChan := func() <-chan *metadata.Meta { | ||||||
|
There was a problem hiding this comment. Why does it have to be in closure (anon function)? There was a problem hiding this comment. No reason, good point, I'll simplify this. |
||||||
| out := make(chan *metadata.Meta) | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
| go func() { | ||||||
| for _, b := range availableBlocks { | ||||||
| out <- b | ||||||
| } | ||||||
| close(out) | ||||||
| }() | ||||||
| return out | ||||||
| }() | ||||||
|
|
||||||
| // fan-out for concurrent replication | ||||||
|
There was a problem hiding this comment. Wrong comment format (full sentence please). |
||||||
| wg := sync.WaitGroup{} | ||||||
| wg.Add(concurrencyLvl) | ||||||
| errs := make(chan error) | ||||||
| for i := 0; i < concurrencyLvl; i++ { | ||||||
| go func(bc <-chan *metadata.Meta, errs chan<- error) { | ||||||
| for b := range bc { | ||||||
| if err := rs.ensureBlockIsReplicated(ctx, b.BlockMeta.ULID); err != nil { | ||||||
| errs <- err | ||||||
| } | ||||||
| } | ||||||
| wg.Done() | ||||||
| }(blocksChan, errs) | ||||||
| } | ||||||
| go func() { | ||||||
| wg.Wait() | ||||||
| close(errs) | ||||||
| }() | ||||||
|
|
||||||
| // fan-in for errors | ||||||
| var me error | ||||||
| for e := range errs { | ||||||
| me = multierror.Append(me, e) | ||||||
| } | ||||||
|
|
||||||
| return me | ||||||
| } | ||||||
|
|
||||||
| // ensureBlockIsReplicated ensures that a block present in the origin bucket is | ||||||
|
|
||||||
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Unfortunately this is not as simple, so if you want to keep this implementation we have to add extra context and set it to 1.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I see what you mean here, even if the problem can be solved by vertical compaction, the blocks should not be uploaded out of sequence for no valid reason.