[ARVADOS] updated: 1.3.0-2952-ga644bfd36

[Git user]

Summary of changes:
 lib/dispatchcloud/scheduler/run_queue_test.go | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

       via  a644bfd36efe4d0ea885d3a1c20809deb748e42e (commit)
      from  2160f72372422c1970a3effb9ba6961b94da318d (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 a644bfd36efe4d0ea885d3a1c20809deb748e42e
Author: Tom Clegg <tom at tomclegg.ca>
Date:   Fri Aug 21 16:11:46 2020 -0400

    16723: Fix stubPool KillContainer(): return false if not running.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at tomclegg.ca>

diff --git a/lib/dispatchcloud/scheduler/run_queue_test.go b/lib/dispatchcloud/scheduler/run_queue_test.go
index 32c6b3b24..992edddfb 100644
--- a/lib/dispatchcloud/scheduler/run_queue_test.go
+++ b/lib/dispatchcloud/scheduler/run_queue_test.go
@@ -83,8 +83,9 @@ func (p *stubPool) ForgetContainer(uuid string) {
 func (p *stubPool) KillContainer(uuid, reason string) bool {
 	p.Lock()
 	defer p.Unlock()
-	delete(p.running, uuid)
-	return true
+	defer delete(p.running, uuid)
+	t, ok := p.running[uuid]
+	return ok && t.IsZero()
 }
 func (p *stubPool) Shutdown(arvados.InstanceType) bool {
 	p.shutdowns++

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


hooks/post-receive
--