[ARVADOS] created: 1.3.0-2552-g79d0b2480

[Git user]

        at  79d0b2480c207c12fd229403384881cd53a234e8 (commit)


commit 79d0b2480c207c12fd229403384881cd53a234e8
Author: Tom Clegg <tom at tomclegg.ca>
Date:   Wed May 13 17:07:11 2020 -0400

    16391: Fix log message.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at tomclegg.ca>

diff --git a/services/crunch-dispatch-slurm/crunch-dispatch-slurm.go b/services/crunch-dispatch-slurm/crunch-dispatch-slurm.go
index 36bcef4f2..4115482d8 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)

-----------------------------------------------------------------------


hooks/post-receive
--