From 4e35b125dacaa2185d383a1b65f81121978467de Mon Sep 17 00:00:00 2001 From: Peter Amstutz Date: Thu, 8 Nov 2018 13:18:59 -0500 Subject: [PATCH] 14458: Drain errorChan without waiting for close Arvados-DCO-1.1-Signed-off-by: Peter Amstutz --- lib/controller/fed_collections.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/controller/fed_collections.go b/lib/controller/fed_collections.go index 2121480e1e..e4982d9ad7 100644 --- a/lib/controller/fed_collections.go +++ b/lib/controller/fed_collections.go @@ -271,7 +271,6 @@ func (h *collectionFederatedRequestHandler) ServeHTTP(w http.ResponseWriter, req } go func() { wg.Wait() - close(errorChan) cancelFunc() }() @@ -284,7 +283,8 @@ func (h *collectionFederatedRequestHandler) ServeHTTP(w http.ResponseWriter, req return case <-sharedContext.Done(): var errors []string - for err := range errorChan { + for len(errorChan) > 0 { + err <- errorChan if httperr, ok := err.(HTTPError); ok { if httperr.Code != http.StatusNotFound { errorCode = http.StatusBadGateway -- 2.39.5