Replicate: Add flag to mark blocks for deletion after replication #7366
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
Signed-off-by: Thomas Sidereal <53402621+Hatry1337@users.noreply.github.com>
Signed-off-by: Thomas Sidereal <53402621+Hatry1337@users.noreply.github.com>
GiedriusS
reviewed
May 20, 2024
|
|
||
| if !deletionMarkExists { | ||
| level.Debug(rs.logger).Log("msg", "marking block for deletion as already replicated", "block_uuid", blockID) | ||
| if err := block.MarkForDeletion(ctx, rs.logger, rs.fromBkt, id, "marked for deletion by thanos bucket replicate", promauto.With(nil).NewCounter(prometheus.CounterOpts{})); err != nil { |
There was a problem hiding this comment.
Why do we have promauto.With(nil).NewCounter(prometheus.CounterOpts{})) here instead of adding something to replicationScheme.reg?
GiedriusS
reviewed
May 20, 2024
| gotOrigin := len(originBucket.Objects()) | ||
| gotTarget := len(targetBucket.Objects()) | ||
|
|
||
| if gotOrigin != expectedOrigin { |
GiedriusS
reviewed
May 20, 2024
| @@ -274,6 +298,23 @@ func (rs *replicationScheme) ensureBlockIsReplicated(ctx context.Context, id uli | |||
| return errors.Wrap(err, "upload meta file") | |||
| } | |||
|
|
|||
| if rs.markAfter { | |||
| deletionMarkFile := path.Join(id.String(), metadata.DeletionMarkFilename) | |||
There was a problem hiding this comment.
MarkForDeletion already checks for this, no? It could get quite expensive to check twice if one is replicating, let's say, 10000 blocks.
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
--mark-aftertothanos tools bucket replicatereplicationScheme.fromBkttype fromInstrumentedBucketReadertoInstrumentedBucket--ignore-marked-for-deletionif--mark-aftersetVerification
--mark-afterflag set