From 8d8c15ca539233e7645690876442c425da45fc1c Mon Sep 17 00:00:00 2001 From: Tonis Tiigi Date: Thu, 18 Mar 2021 22:46:49 -0700 Subject: [PATCH] contentproxy: ensure grpc stream is closed on commit Signed-off-by: Tonis Tiigi --- content/proxy/content_writer.go | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/content/proxy/content_writer.go b/content/proxy/content_writer.go index 5434a1568..842333598 100644 --- a/content/proxy/content_writer.go +++ b/content/proxy/content_writer.go @@ -97,7 +97,14 @@ func (rw *remoteWriter) Write(p []byte) (n int, err error) { return } -func (rw *remoteWriter) Commit(ctx context.Context, size int64, expected digest.Digest, opts ...content.Opt) error { +func (rw *remoteWriter) Commit(ctx context.Context, size int64, expected digest.Digest, opts ...content.Opt) (err error) { + defer func() { + err1 := rw.Close() + if err == nil { + err = err1 + } + }() + var base content.Info for _, opt := range opts { if err := opt(&base); err != nil {