X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/a4396e183ec11a7241cf5089c5ccfbca1ad8627f..27992e62e71eb2ad4297c4eb3f4e787c4b000b90:/lib/dispatchcloud/scheduler/fix_stale_locks.go

diff --git a/lib/dispatchcloud/scheduler/fix_stale_locks.go b/lib/dispatchcloud/scheduler/fix_stale_locks.go
index 4bd27021c6..dbd8b609a9 100644
--- a/lib/dispatchcloud/scheduler/fix_stale_locks.go
+++ b/lib/dispatchcloud/scheduler/fix_stale_locks.go
@@ -7,8 +7,8 @@ package scheduler
 import (
 	"time"
 
-	"git.curoverse.com/arvados.git/lib/dispatchcloud/worker"
-	"git.curoverse.com/arvados.git/sdk/go/arvados"
+	"git.arvados.org/arvados.git/lib/dispatchcloud/worker"
+	"git.arvados.org/arvados.git/sdk/go/arvados"
 )
 
 // fixStaleLocks waits for any already-locked containers (i.e., locked
@@ -23,7 +23,7 @@ func (sch *Scheduler) fixStaleLocks() {
 	var stale []string
 	timeout := time.NewTimer(sch.staleLockTimeout)
 waiting:
-	for {
+	for sch.pool.CountWorkers()[worker.StateUnknown] > 0 {
 		running := sch.pool.Running()
 		qEntries, _ := sch.queue.Entries()
 
@@ -43,16 +43,10 @@ waiting:
 
 		select {
 		case <-wp:
-			// Stop waiting if all workers have been
-			// contacted.
-			if sch.pool.CountWorkers()[worker.StateUnknown] == 0 {
-				break waiting
-			}
 		case <-timeout.C:
 			// Give up.
 			break waiting
 		}
-
 	}
 
 	for _, uuid := range stale {