16306: Merge branch 'master'

[arvados.git] / lib / dispatchcloud / test / queue.go

diff --git a/lib/dispatchcloud/test/queue.go b/lib/dispatchcloud/test/queue.go
index 74b84122f286d912d8f8ef392e3eb860e6b1831d..3598ec6da05baf23d3eaed302ec8db603f38e96c 100644 (file)
--- a/lib/dispatchcloud/test/queue.go
+++ b/lib/dispatchcloud/test/queue.go
@@ -172,12 +172,11 @@ func (q *Queue) Notify(upd arvados.Container) bool {
                        if allowContainerUpdate[ctr.State][upd.State] {
                                q.Containers[i] = upd
                                return true
-                       } else {
-                               if q.Logger != nil {
-                                       q.Logger.WithField("ContainerUUID", ctr.UUID).Infof("test.Queue rejected update from %s to %s", ctr.State, upd.State)
-                               }
-                               return false
                        }
+                       if q.Logger != nil {
+                               q.Logger.WithField("ContainerUUID", ctr.UUID).Infof("test.Queue rejected update from %s to %s", ctr.State, upd.State)
+                       }
+                       return false
                }
        }
        q.Containers = append(q.Containers, upd)
@@ -185,18 +184,18 @@ func (q *Queue) Notify(upd arvados.Container) bool {
 }
 
 var allowContainerUpdate = map[arvados.ContainerState]map[arvados.ContainerState]bool{
-       arvados.ContainerStateQueued: map[arvados.ContainerState]bool{
+       arvados.ContainerStateQueued: {
                arvados.ContainerStateQueued:    true,
                arvados.ContainerStateLocked:    true,
                arvados.ContainerStateCancelled: true,
        },
-       arvados.ContainerStateLocked: map[arvados.ContainerState]bool{
+       arvados.ContainerStateLocked: {
                arvados.ContainerStateQueued:    true,
                arvados.ContainerStateLocked:    true,
                arvados.ContainerStateRunning:   true,
                arvados.ContainerStateCancelled: true,
        },
-       arvados.ContainerStateRunning: map[arvados.ContainerState]bool{
+       arvados.ContainerStateRunning: {
                arvados.ContainerStateRunning:   true,
                arvados.ContainerStateCancelled: true,
                arvados.ContainerStateComplete:  true,