12983: Change break -> return to exit goroutine, add comment
authorPeter Amstutz <pamstutz@veritasgenetics.com>
Wed, 11 Jul 2018 19:15:38 +0000 (15:15 -0400)
committerPeter Amstutz <pamstutz@veritasgenetics.com>
Wed, 11 Jul 2018 19:15:38 +0000 (15:15 -0400)
Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz@veritasgenetics.com>

services/crunch-run/crunchrun.go

index 4cbe7f9c9c299f0509a7266ce8541d64f5c75d79..098c53f8a6a587816703ad6997ceb51eec7f0232 100644 (file)
@@ -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
                                }
                        }
                }()