projects
/
arvados.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
2edd084
)
12891: Fix use of magic string.
author
Tom Clegg <tclegg@veritasgenetics.com>
Thu, 18 Jan 2018 21:41:14 +0000
(16:41 -0500)
committer
Tom Clegg <tclegg@veritasgenetics.com>
Mon, 22 Jan 2018 17:34:03 +0000
(12:34 -0500)
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg@veritasgenetics.com>
services/crunch-run/crunchrun.go
patch
|
blob
|
history
diff --git
a/services/crunch-run/crunchrun.go
b/services/crunch-run/crunchrun.go
index b8c80dd2476d0c2f67c798f2cc5451da574ecb27..a78d47d480ae23deb9953ca96713d827ed57e2cd 100644
(file)
--- a/
services/crunch-run/crunchrun.go
+++ b/
services/crunch-run/crunchrun.go
@@
-930,7
+930,7
@@
func (runner *ContainerRunner) StartContainer() error {
func (runner *ContainerRunner) WaitFinish() (err error) {
runner.CrunchLog.Print("Waiting for container to finish")
- waitOk, waitErr := runner.Docker.ContainerWait(context.TODO(), runner.ContainerID,
"not-running"
)
+ waitOk, waitErr := runner.Docker.ContainerWait(context.TODO(), runner.ContainerID,
dockercontainer.WaitConditionNotRunning
)
go func() {
<-runner.ArvMountExit