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

Copy chunk bytes in TSDB store before sending to client #6203

Merged
merged 2 commits into from
Mar 13, 2023
Merged

Copy chunk bytes in TSDB store before sending to client #6203

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e65955b
Copy chunk bytes in TSDB store before sending to client
fpetkovski Jan 31, 2023
681a17a
Add CHANGELOG entry
fpetkovski Mar 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ We use *breaking :warning:* to mark changes that are not backward compatible (re

### Fixed

- [#6203](https://github.com/thanos-io/thanos/pull/6203) Receive: Fix panic in head compaction under high query load.

### Changed

### Removed
Expand Down
6 changes: 4 additions & 2 deletions pkg/store/tsdb.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,13 +202,15 @@ func (s *TSDBStore) Series(r *storepb.SeriesRequest, srv storepb.Store_SeriesSer
return status.Errorf(codes.Internal, "TSDBStore: found not populated chunk returned by SeriesSet at ref: %v", chk.Ref)
}

chunkBytes := make([]byte, len(chk.Chunk.Bytes()))
copy(chunkBytes, chk.Chunk.Bytes())
c := storepb.AggrChunk{
MinTime: chk.MinTime,
MaxTime: chk.MaxTime,
Raw: &storepb.Chunk{
Type: storepb.Chunk_Encoding(chk.Chunk.Encoding() - 1), // Proto chunk encoding is one off to TSDB one.
Data: chk.Chunk.Bytes(),
Hash: hashChunk(hasher, chk.Chunk.Bytes(), enableChunkHashCalculation),
Data: chunkBytes,
Hash: hashChunk(hasher, chunkBytes, enableChunkHashCalculation),
},
}
frameBytesLeft -= c.Size()
Expand Down