[ARVADOS] updated: 1.2.0-319-g4e35b125d

[Git user]

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

       via  4e35b125dacaa2185d383a1b65f81121978467de (commit)
      from  6938e8cff1632d597cfbd333e4d5176805b628c6 (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 4e35b125dacaa2185d383a1b65f81121978467de
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date:   Thu Nov 8 13:18:59 2018 -0500

    14458: Drain errorChan without waiting for close
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz at veritasgenetics.com>

diff --git a/lib/controller/fed_collections.go b/lib/controller/fed_collections.go
index 2121480e1..e4982d9ad 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

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


hooks/post-receive
--