X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/cda50fb57f9b18cb769432876433b52f484692bd..39c17737ac69d7693684fe2f95bef0ec235a28bf:/services/crunch-run/crunchrun.go

diff --git a/services/crunch-run/crunchrun.go b/services/crunch-run/crunchrun.go
index 4cbe7f9c9c..0a980b9ce9 100644
--- a/services/crunch-run/crunchrun.go
+++ b/services/crunch-run/crunchrun.go
@@ -742,6 +742,7 @@ func (runner *ContainerRunner) startCrunchstat() error {
 		CgroupParent: runner.expectCgroupParent,
 		CgroupRoot:   runner.cgroupRoot,
 		PollPeriod:   runner.statInterval,
+		TempDir:      runner.parentTemp,
 	}
 	runner.statReporter.Start()
 	return nil
@@ -1122,9 +1123,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 +1136,8 @@ func (runner *ContainerRunner) WaitFinish() error {
 						return
 					}
 				case <-containerdGone:
-					break
+					// Channel closed, quit goroutine
+					return
 				}
 			}
 		}()