From f9cb9d25daf36e11994e052d63466b208b3aef62 Mon Sep 17 00:00:00 2001 From: Tom Clegg Date: Thu, 11 Jan 2024 11:45:10 -0500 Subject: [PATCH] 20318: Propagate Close error from http backend. This isn't known to happen, but if it does, it should propagate. Arvados-DCO-1.1-Signed-off-by: Tom Clegg --- sdk/go/keepclient/gateway_shim.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sdk/go/keepclient/gateway_shim.go b/sdk/go/keepclient/gateway_shim.go index 0675ed9877..260824453d 100644 --- a/sdk/go/keepclient/gateway_shim.go +++ b/sdk/go/keepclient/gateway_shim.go @@ -46,8 +46,11 @@ func (kvh *keepViaHTTP) BlockRead(ctx context.Context, opts arvados.BlockReadOpt if err != nil { return 0, err } - defer rdr.Close() n, err := io.Copy(opts.WriteTo, rdr) + errClose := rdr.Close() + if err == nil { + err = errClose + } return int(n), err } -- 2.39.5