Skip to content

blob: removes race condition between ctx cancellation and stream close #167489

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
trunk-io merged 1 commit into from
Apr 6, 2026
Merged

blob: removes race condition between ctx cancellation and stream close #167489

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 8 additions & 1 deletion pkg/blobs/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,11 +124,15 @@ func (c *remoteClient) readFileWithFlowControl(
}

type streamWriter struct {
ctx context.Context
s blobspb.RPCBlob_PutStreamClient
buf blobspb.StreamChunk
}

func (w *streamWriter) Write(p []byte) (int, error) {
if err := w.ctx.Err(); err != nil {
return 0, err
}
n := 0
for len(p) > 0 {
l := copy(w.buf.Payload[:cap(w.buf.Payload)], p)
Expand All @@ -145,6 +149,9 @@ func (w *streamWriter) Write(p []byte) (int, error) {
}

func (w *streamWriter) Close() error {
if err := w.ctx.Err(); err != nil {
return err
}
_, err := w.s.CloseAndRecv()
return err
}
Expand All @@ -156,7 +163,7 @@ func (c *remoteClient) Writer(ctx context.Context, file string) (io.WriteCloser,
return nil, err
}
buf := make([]byte, 0, ChunkSize)
return &streamWriter{s: stream, buf: blobspb.StreamChunk{Payload: buf}}, nil
return &streamWriter{ctx: ctx, s: stream, buf: blobspb.StreamChunk{Payload: buf}}, nil
}

func (c *remoteClient) List(ctx context.Context, pattern string) ([]string, error) {
Expand Down
Loading