From 817ee84de15cdc960990e86af8ce705073fcafba Mon Sep 17 00:00:00 2001 From: Tom Clegg Date: Tue, 5 Jul 2022 14:47:14 -0400 Subject: [PATCH] 19166: Close connections to container gateway when finished. Arvados-DCO-1.1-Signed-off-by: Tom Clegg --- sdk/go/arvados/container_gateway.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sdk/go/arvados/container_gateway.go b/sdk/go/arvados/container_gateway.go index ce33fb3105..ec16ee2be9 100644 --- a/sdk/go/arvados/container_gateway.go +++ b/sdk/go/arvados/container_gateway.go @@ -15,6 +15,7 @@ import ( ) func (cresp ConnectionResponse) ServeHTTP(w http.ResponseWriter, req *http.Request) { + defer cresp.Conn.Close() hj, ok := w.(http.Hijacker) if !ok { http.Error(w, "ResponseWriter does not support connection upgrade", http.StatusInternalServerError) @@ -48,6 +49,7 @@ func (cresp ConnectionResponse) ServeHTTP(w http.ResponseWriter, req *http.Reque if err != nil { ctxlog.FromContext(ctx).WithError(err).Error("error copying downstream") } + conn.Close() }() wg.Add(1) go func() { @@ -62,6 +64,7 @@ func (cresp ConnectionResponse) ServeHTTP(w http.ResponseWriter, req *http.Reque if err != nil { ctxlog.FromContext(ctx).WithError(err).Error("error copying upstream") } + cresp.Conn.Close() }() wg.Wait() if cresp.Logger != nil { -- 2.30.2