Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Replicate: Add flag to mark blocks for deletion after replication #7366

Open
wants to merge 10 commits into
base: main
Choose a base branch
from
Open

Replicate: Add flag to mark blocks for deletion after replication #7366

wants to merge 10 commits into from

Conversation

Hatry1337
Copy link

@Hatry1337 Hatry1337 commented May 16, 2024 •
edited
Loading

  • I added CHANGELOG entry for this change.
  • Change is not relevant to the end user.

Changes

  • Added flag --mark-after to thanos tools bucket replicate
  • Changed replicationScheme.fromBkt type from InstrumentedBucketReader to InstrumentedBucket
  • Added forcing --ignore-marked-for-deletion if --mark-after set

Verification

  • Successfully built project
  • Ran replication between 2 buckets with --mark-after flag set
  • Monitored bucket contents for deletion marks
  • Made sure compactor removed marked blocks
  • Made sure blocks replicated successfully

GiedriusS
GiedriusS reviewed May 20, 2024
View reviewed changes
pkg/replicate/scheme.go Outdated Show resolved Hide resolved
GiedriusS
GiedriusS reviewed May 20, 2024
View reviewed changes
pkg/replicate/scheme.go Outdated Show resolved Hide resolved
@pull-request-size pull-request-size bot added size/L and removed size/M labels Oct 31, 2024
yeya24
yeya24 reviewed Nov 3, 2024
View reviewed changes
CHANGELOG.md Outdated Show resolved Hide resolved
cmd/thanos/tools_bucket.go Outdated Show resolved Hide resolved
@Hatry1337 Hatry1337 requested a review from yeya24 November 3, 2024 21:28
@yeya24
Copy link
Contributor

yeya24 commented Nov 4, 2024

Please fix lint and DCO

@Hatry1337
Replicate: Add flag to mark blocks for deletion after replication
039844e 
Signed-off-by: Hatry1337 <53402621+Hatry1337@users.noreply.github.com>
@Hatry1337
Add tests
6773ea1 
Signed-off-by: Hatry1337 <53402621+Hatry1337@users.noreply.github.com>
@Hatry1337
Use testutil.Equals instead of direct condition statements
f24421d 
Signed-off-by: Hatry1337 <53402621+Hatry1337@users.noreply.github.com>
@Hatry1337
Add blocks marked for deletion metric
eeb5c55 
Signed-off-by: Hatry1337 <53402621+Hatry1337@users.noreply.github.com>
@Hatry1337
Get rid of redundant deletion mark check
22d6877 
Signed-off-by: Hatry1337 <53402621+Hatry1337@users.noreply.github.com>
@Hatry1337
Rename 'mark-after' to 'mark-deletion' flag; Fix already replicated b…
a053f39 
…locks deletion marking; Add flag name to CHANGELOG.md

Signed-off-by: Hatry1337 <53402621+Hatry1337@users.noreply.github.com>
Hatry1337 and others added 2 commits November 5, 2024 15:33
@Hatry1337
Generate doc
c51a321 
Signed-off-by: Hatry1337 <53402621+Hatry1337@users.noreply.github.com>
@Hatry1337
Revert CHANGELOG.md merge
e7cd05e 
Signed-off-by: Hatry1337 <53402621+Hatry1337@users.noreply.github.com>
@Hatry1337
Merge branch 'main' into main
e72915f
@Hatry1337
Add changelog entry
2b439da 
Signed-off-by: Hatry1337 <53402621+Hatry1337@users.noreply.github.com>
@Hatry1337
Copy link
Author

fixed

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@yeya24 yeya24 Awaiting requested review from yeya24

@GiedriusS GiedriusS Awaiting requested review from GiedriusS

At least 1 approving review is required to merge this pull request.

Assignees
No one assigned
Labels
size/L
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@Hatry1337 @yeya24 @GiedriusS