Skip to content

fix: prevent double-close inflating zstd pool release counters #330

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

Merged
EdSchouten merged 3 commits into from
Mar 12, 2026
Merged

fix: prevent double-close inflating zstd pool release counters #330

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b8f6607
fix: prevent double-close inflating zstd pool release counters
aron-muon Mar 12, 2026
6a68e25
fix: use nil guard instead of bool for double-close protection
aron-muon Mar 12, 2026
7695823
fix: use util.StatusWrap for decoder acquisition error
aron-muon Mar 12, 2026
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
1 change: 0 additions & 1 deletion pkg/blobstore/grpcservers/byte_stream_server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,6 @@ func (s *byteStreamServer) writeZstd(stream bytestream.ByteStream_WriteServer, r
if err != nil {
return status.Errorf(codes.ResourceExhausted, "Failed to acquire ZSTD decoder: %v", err)
}
defer zstdReader.Close()

if err := s.blobAccess.Put(
ctx,
Expand Down
10 changes: 10 additions & 0 deletions pkg/zstd/metrics_pool.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,9 +123,14 @@ func (p *metricsPool) NewDecoder(ctx context.Context, r io.Reader) (Decoder, err
type metricsEncoder struct {
Encoder
releases prometheus.Counter
closed bool
}

func (e *metricsEncoder) Close() error {
if e.closed {
return nil
}
e.closed = true
err := e.Encoder.Close()
e.releases.Inc()
return err
Expand All @@ -134,9 +139,14 @@ func (e *metricsEncoder) Close() error {
type metricsDecoder struct {
Decoder
releases prometheus.Counter
closed bool
}

func (d *metricsDecoder) Close() {
if d.closed {
return
}
d.closed = true
d.Decoder.Close()
d.releases.Inc()
}