From db83f805e4ccf82eef22fe2c9a3db38ebd772a83 Mon Sep 17 00:00:00 2001 From: Tom Clegg Date: Wed, 13 May 2020 17:07:11 -0400 Subject: [PATCH] 16391: Fix log message. Arvados-DCO-1.1-Signed-off-by: Tom Clegg --- services/crunch-dispatch-slurm/crunch-dispatch-slurm.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/services/crunch-dispatch-slurm/crunch-dispatch-slurm.go b/services/crunch-dispatch-slurm/crunch-dispatch-slurm.go index 36bcef4f26..4115482d80 100644 --- a/services/crunch-dispatch-slurm/crunch-dispatch-slurm.go +++ b/services/crunch-dispatch-slurm/crunch-dispatch-slurm.go @@ -280,7 +280,8 @@ func (disp *Dispatcher) runContainer(_ *dispatch.Dispatcher, ctr arvados.Contain cmd = append(cmd, disp.cluster.Containers.CrunchRunArgumentsList...) if err := disp.submit(ctr, cmd); err != nil { var text string - if err, ok := err.(dispatchcloud.ConstraintsNotSatisfiableError); ok { + switch err := err.(type) { + case dispatchcloud.ConstraintsNotSatisfiableError: var logBuf bytes.Buffer fmt.Fprintf(&logBuf, "cannot run container %s: %s\n", ctr.UUID, err) if len(err.AvailableTypes) == 0 { @@ -296,7 +297,7 @@ func (disp *Dispatcher) runContainer(_ *dispatch.Dispatcher, ctr arvados.Contain } text = logBuf.String() disp.UpdateState(ctr.UUID, dispatch.Cancelled) - } else { + default: text = fmt.Sprintf("Error submitting container %s to slurm: %s", ctr.UUID, err) } log.Print(text) -- 2.30.2