projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
14008: Merge branch 'master' into 14008-containers-index
[arvados.git]
/
services
/
crunch-run
/
crunchrun.go
diff --git
a/services/crunch-run/crunchrun.go
b/services/crunch-run/crunchrun.go
index 4cbe7f9c9c299f0509a7266ce8541d64f5c75d79..0a980b9ce9359cde4529928e78eba06ac74644f3 100644
(file)
--- 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,
CgroupParent: runner.expectCgroupParent,
CgroupRoot: runner.cgroupRoot,
PollPeriod: runner.statInterval,
+ TempDir: runner.parentTemp,
}
runner.statReporter.Start()
return nil
}
runner.statReporter.Start()
return nil
@@
-1122,9
+1123,7
@@
func (runner *ContainerRunner) WaitFinish() error {
}
containerdGone := make(chan 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))
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:
return
}
case <-containerdGone:
- break
+ // Channel closed, quit goroutine
+ return
}
}
}()
}
}
}()