fix: Handle EOF when reading from some obj stores #13868
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
benclive
changed the title
grobinson-grafana
approved these changes
Aug 13, 2024
pkg/querier-rf1/wal/chunks.go
Outdated
| "sort" | ||
|
|
||
| "github.com/pkg/errors" |
There was a problem hiding this comment.
Suggested change
| "github.com/pkg/errors" | |
| "errors" |
pkg/querier-rf1/wal/chunks.go
Outdated
| @@ -309,14 +311,14 @@ func readChunkData(ctx context.Context, storage BlockStorage, chunk ChunkData) ( | |||
| // together. | |||
| reader, err := storage.GetObjectRange(ctx, wal.Dir+chunk.id, int64(offset), int64(size)) | |||
| if err != nil { | |||
| return nil, err | |||
| return nil, errors.Wrap(err, "could not get range reader for "+chunk.id) | |||
There was a problem hiding this comment.
Suggested change
| return nil, errors.Wrap(err, "could not get range reader for "+chunk.id) | |
| return nil, fmt.Errorf("could not get range reader for %s: %w", chunk.id, err) |
pkg/querier-rf1/wal/chunks.go
Outdated
| } | ||
| defer reader.Close() | ||
|
|
||
| data := make([]byte, size) | ||
| _, err = reader.Read(data) | ||
| if err != nil { | ||
| return nil, err | ||
| if err != nil && err != io.EOF { |
There was a problem hiding this comment.
Suggested change
| if err != nil && err != io.EOF { | |
| if err != nil && !errors.Is(err, io.EOF) { |
pkg/querier-rf1/wal/chunks.go
Outdated
| if err != nil { | ||
| return nil, err | ||
| if err != nil && err != io.EOF { | ||
| return nil, errors.Wrap(err, "could not read socket for "+chunk.id) |
There was a problem hiding this comment.
Suggested change
| return nil, errors.Wrap(err, "could not read socket for "+chunk.id) | |
| return nil, fmt.Errorf("could not read socket for %s: %w", chunk.id, err) |
This was referenced Oct 14, 2024
This was referenced Oct 21, 2024
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 / why we need it: