[ARVADOS] created: 2.1.0-452-g13b26feb9

[Git user]

        at  13b26feb97cd3971b86b62a68aa6178d5cb4ecfa (commit)


commit 13b26feb97cd3971b86b62a68aa6178d5cb4ecfa
Author: Tom Clegg <tom at curii.com>
Date:   Thu Feb 18 10:02:30 2021 -0500

    16745: Fix nil error returned instead of client pool error.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>

diff --git a/services/keep-web/handler.go b/services/keep-web/handler.go
index 2d6fb78f8..50e3a0ce0 100644
--- a/services/keep-web/handler.go
+++ b/services/keep-web/handler.go
@@ -520,7 +520,8 @@ func (h *handler) ServeHTTP(wOrig http.ResponseWriter, r *http.Request) {
 func (h *handler) getClients(reqID, token string) (arv *arvadosclient.ArvadosClient, kc *keepclient.KeepClient, client *arvados.Client, release func(), err error) {
 	arv = h.clientPool.Get()
 	if arv == nil {
-		return nil, nil, nil, nil, err
+		err = h.clientPool.Err()
+		return
 	}
 	release = func() { h.clientPool.Put(arv) }
 	arv.ApiToken = token

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


hooks/post-receive
--