X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/c2aceca339ec3a6f3d853865cebd0efe348ff518..b7ec820ac297bc316ef9ffa36242e7928acbc0b4:/services/crunch-dispatch-local/crunch-dispatch-local.go diff --git a/services/crunch-dispatch-local/crunch-dispatch-local.go b/services/crunch-dispatch-local/crunch-dispatch-local.go index c202e683f2..a3cb1341a4 100644 --- a/services/crunch-dispatch-local/crunch-dispatch-local.go +++ b/services/crunch-dispatch-local/crunch-dispatch-local.go @@ -169,7 +169,7 @@ type LocalRun struct { // crunch-run terminates, mark the container as Cancelled. func (lr *LocalRun) run(dispatcher *dispatch.Dispatcher, container arvados.Container, - status <-chan arvados.Container) { + status <-chan arvados.Container) error { uuid := container.UUID @@ -179,7 +179,7 @@ func (lr *LocalRun) run(dispatcher *dispatch.Dispatcher, case lr.concurrencyLimit <- true: break case <-lr.ctx.Done(): - return + return lr.ctx.Err() } defer func() { <-lr.concurrencyLimit }() @@ -270,4 +270,5 @@ Finish: } dispatcher.Logger.Printf("finalized container %v", uuid) + return nil }