Merge branch '14938-unreliable-test'

[arvados.git] / 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 4bd27021c675d1c8ce40753d131d0631041ea59c..148b653c2e52305b2ece2255c49d98bf6cb72f50 100644 (file)
--- a/lib/dispatchcloud/scheduler/fix_stale_locks.go
+++ b/lib/dispatchcloud/scheduler/fix_stale_locks.go
@@ -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,11 +43,6 @@ 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