Fix -compact.skip-block-with-out-of-order-chunks #4566
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
Signed-off-by: Marco Pracucci <marco@pracucci.com>
pracucci
commented
Aug 13, 2021
| @@ -783,7 +776,7 @@ func (cg *Group) compact(ctx context.Context, dir string, planner Planner, comp | |||
| return false, ulid.ULID{}, halt(errors.Wrapf(err, "block with not healthy index found %s; Compaction level %v; Labels: %v", bdir, meta.Compaction.Level, meta.Thanos.Labels)) | |||
| } | |||
|
|
|||
| if err := stats.OutOfOrderChunksErr(); cg.skipChunksWithOutofOrderBlocks && err != nil { | |||
| if err := stats.OutOfOrderChunksErr(); err != nil { | |||
There was a problem hiding this comment.
With the code in main, if cg.skipChunksWithOutofOrderBlocks is false then we don't return error but we do toCompactDirs = append(toCompactDirs, bdir) below, which is wrong.
pracucci
commented
Aug 13, 2021
| // If block has out of order chunk and it has been configured to skip it, | ||
| // then we can mark the block for no compaction so that the next compaction run | ||
| // will skip it. | ||
| if IsOutOfOrderChunkError(err) && c.skipBlocksWithOutOfOrderChunks { |
There was a problem hiding this comment.
I believe this is the right place where we should check for skipBlocksWithOutOfOrderChunks. If enabled (which means we skip it), then we do mark the block for no-compaction and we continue processing the next job from the queue. If disabled (which means we don't skip the block) then we should error out (done below).
|
LGTM, thanks for the fix. |
3 tasks
3 tasks
3 tasks
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
The PR #4469 was just merged but I've the feeling it's not correct. The problem is that when the skip is disabled it should still be a critical error while right now the error is ignored at all (see comment annotation in the PR).
Also, from a design perspective, I don't think it's the responsibility of the grouper to know if skipping is enabled or not, so I've moved that config to the
BucketCompactor.Verification
Existing tests.