[arvados] updated: 2.5.0-306-gb402b894c

[git repository hosting]

Summary of changes:
 lib/controller/localdb/container_gateway.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

       via  b402b894c535f95cdeba0631dea1fbb9c7672a07 (commit)
      from  6d03fdac5674dc88eff821f5e8ac70642f39a895 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit b402b894c535f95cdeba0631dea1fbb9c7672a07
Author: Tom Clegg <tom at curii.com>
Date:   Tue Apr 4 11:00:22 2023 -0400

    19889: Fix crash on gateway connect error.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>

diff --git a/lib/controller/localdb/container_gateway.go b/lib/controller/localdb/container_gateway.go
index 384f471db..59592ece9 100644
--- a/lib/controller/localdb/container_gateway.go
+++ b/lib/controller/localdb/container_gateway.go
@@ -439,7 +439,7 @@ func (conn *Conn) findGateway(ctx context.Context, ctr arvados.Container, noForw
 		return func() (net.Conn, string, string, error) {
 			rawconn, err := (&net.Dialer{}).DialContext(ctx, "tcp", ctr.GatewayAddress)
 			if err != nil {
-				err = httpserver.ErrorWithStatus(err, http.StatusServiceUnavailable)
+				return nil, "", "", httpserver.ErrorWithStatus(err, http.StatusServiceUnavailable)
 			}
 			return conn.dialGatewayTLS(ctx, ctr, rawconn)
 		}, nil, nil
@@ -461,7 +461,7 @@ func (conn *Conn) findGateway(ctx context.Context, ctr arvados.Container, noForw
 		return func() (net.Conn, string, string, error) {
 			rawconn, err := tunnel.Open()
 			if err != nil {
-				err = httpserver.ErrorWithStatus(err, http.StatusServiceUnavailable)
+				return nil, "", "", httpserver.ErrorWithStatus(err, http.StatusServiceUnavailable)
 			}
 			return conn.dialGatewayTLS(ctx, ctr, rawconn)
 		}, nil, nil

-----------------------------------------------------------------------


hooks/post-receive
--