X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/505c8fa50631201e289cc55230d46fdf52fa2055..0e68845158573e94e5a6e2ed595b5a370420a543:/lib/dispatchcloud/test/queue.go diff --git a/lib/dispatchcloud/test/queue.go b/lib/dispatchcloud/test/queue.go index 74b84122f2..3598ec6da0 100644 --- 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,