Merged
Conversation
Signed-off-by: Joe Elliott <number101010@gmail.com>
Signed-off-by: Joe Elliott <number101010@gmail.com>
Signed-off-by: Joe Elliott <number101010@gmail.com>
Signed-off-by: Joe Elliott <number101010@gmail.com>
Signed-off-by: Joe Elliott <number101010@gmail.com>
Signed-off-by: Joe Elliott <number101010@gmail.com>
mattdurham
reviewed
Mar 27, 2025
This file contains hidden or 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
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.
What this PR does:
Compactors rarely panic with a stack like:
This was caused by the
io.BufferedReaderAtnot invalidating buffers when an error was received here:tempo/pkg/io/buffered.go
Lines 64 to 68 in c5e5978
Later it was possible to return data from this buffer as if it were correct even though the buffer was in an unknown state.
Other Changes
BufferedWriterWithQueueb/c it was unused.BufferedReaderAt. Previously it would drop the primary lock for per-buffer locking before it attempted to read from the backend. This was designed to prevent this struct from serializing calls to object storage. I believe this could be maintained with the fix, but it was getting quite complicated. Consider that you would need to handle a buffer being invalid after it had been already selected b/c the read might invalidate it. Since this code was only used in the compactors I favored simplicity over performance. There is a small, but reasonable performance hit.Checklist
CHANGELOG.mdupdated - the order of entries should be[CHANGE],[FEATURE],[ENHANCEMENT],[BUGFIX]