[ARVADOS] updated: 1.1.4-565-gac6a1a232

[Git user]

Summary of changes:
 services/crunch-run/crunchrun.go | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

       via  ac6a1a232a670d10ce12d19e6d2a7900d353943a (commit)
      from  cda50fb57f9b18cb769432876433b52f484692bd (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 ac6a1a232a670d10ce12d19e6d2a7900d353943a
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date:   Wed Jul 11 15:15:38 2018 -0400

    12983: Change break -> return to exit goroutine, add comment
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz at veritasgenetics.com>

diff --git a/services/crunch-run/crunchrun.go b/services/crunch-run/crunchrun.go
index 4cbe7f9c9..098c53f8a 100644
--- a/services/crunch-run/crunchrun.go
+++ b/services/crunch-run/crunchrun.go
@@ -1122,9 +1122,7 @@ func (runner *ContainerRunner) WaitFinish() error {
 	}
 
 	containerdGone := make(chan error)
-	defer func() {
-		close(containerdGone)
-	}()
+	defer close(containerdGone)
 	if runner.checkContainerd > 0 {
 		go func() {
 			ticker := time.NewTicker(time.Duration(runner.checkContainerd))
@@ -1137,7 +1135,8 @@ func (runner *ContainerRunner) WaitFinish() error {
 						return
 					}
 				case <-containerdGone:
-					break
+					// Channel closed, quit goroutine
+					return
 				}
 			}
 		}()

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


hooks/post-receive
--