X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/ec3deb3aee4bab253882ab7d83c062a208a72644..090e546b14e13798d15ac61728da05a0d9fb1317:/services/crunch-dispatch-local/crunch-dispatch-local.go?ds=sidebyside diff --git a/services/crunch-dispatch-local/crunch-dispatch-local.go b/services/crunch-dispatch-local/crunch-dispatch-local.go index 0255831ccd..e05c0c5da4 100644 --- a/services/crunch-dispatch-local/crunch-dispatch-local.go +++ b/services/crunch-dispatch-local/crunch-dispatch-local.go @@ -176,19 +176,15 @@ func run(uuid string, crunchRunCommand string, priorityPollInterval int) { // A goroutine to terminate the runner if container priority becomes zero priorityTicker := time.NewTicker(time.Duration(priorityPollInterval) * time.Second) go func() { - for { - select { - case <-priorityTicker.C: - var container Container - err := arv.Get("containers", uuid, nil, &container) - if err != nil { - log.Printf("Error getting container info for %v: %q", uuid, err) - } else { - if container.Priority == 0 { - priorityTicker.Stop() - cmd.Process.Signal(os.Interrupt) - return - } + for _ = range priorityTicker.C { + var container Container + err := arv.Get("containers", uuid, nil, &container) + if err != nil { + log.Printf("Error getting container info for %v: %q", uuid, err) + } else { + if container.Priority == 0 { + priorityTicker.Stop() + cmd.Process.Signal(os.Interrupt) } } } @@ -219,4 +215,6 @@ func run(uuid string, crunchRunCommand string, priorityPollInterval int) { log.Printf("Error updating container state to Complete for %v: %q", uuid, err) } } + + log.Printf("Finished container run for %v", uuid) }