[ARVADOS] updated: 1.3.0-1887-g40e9a645d

[Git user]

Summary of changes:
 lib/dispatchcloud/container/queue.go | 2 +-
 lib/dispatchcloud/scheduler/sync.go  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

       via  40e9a645da140a6b94497d1a79ba8783d22421f7 (commit)
      from  a1f06e4e118923d301683824ccd47bcf68c8ef69 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 40e9a645da140a6b94497d1a79ba8783d22421f7
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Tue Nov 19 16:25:48 2019 -0500

    15707: Fix "on hold" containers not dropped from queue.
    
    refs #15707
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>

diff --git a/lib/dispatchcloud/container/queue.go b/lib/dispatchcloud/container/queue.go
index 50e73189e..f999ee80a 100644
--- a/lib/dispatchcloud/container/queue.go
+++ b/lib/dispatchcloud/container/queue.go
@@ -133,7 +133,7 @@ func (cq *Queue) Forget(uuid string) {
 	cq.mtx.Lock()
 	defer cq.mtx.Unlock()
 	ctr := cq.current[uuid].Container
-	if ctr.State == arvados.ContainerStateComplete || ctr.State == arvados.ContainerStateCancelled {
+	if ctr.State == arvados.ContainerStateComplete || ctr.State == arvados.ContainerStateCancelled || (ctr.State == arvados.ContainerStateQueued && ctr.Priority == 0) {
 		cq.delEnt(uuid, ctr.State)
 	}
 }
diff --git a/lib/dispatchcloud/scheduler/sync.go b/lib/dispatchcloud/scheduler/sync.go
index 205ee5018..e306db00c 100644
--- a/lib/dispatchcloud/scheduler/sync.go
+++ b/lib/dispatchcloud/scheduler/sync.go
@@ -51,7 +51,7 @@ func (sch *Scheduler) sync() {
 				sch.logger.WithFields(logrus.Fields{
 					"ContainerUUID": uuid,
 					"State":         ent.Container.State,
-				}).Info("container finished")
+				}).Info("container finished -- dropping from queue")
 				sch.queue.Forget(uuid)
 			}
 		case arvados.ContainerStateQueued:
@@ -66,7 +66,7 @@ func (sch *Scheduler) sync() {
 					"ContainerUUID": uuid,
 					"State":         ent.Container.State,
 					"Priority":      ent.Container.Priority,
-				}).Info("container on hold")
+				}).Info("container on hold -- dropping from queue")
 				sch.queue.Forget(uuid)
 			}
 		case arvados.ContainerStateLocked:

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


hooks/post-receive
--