projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
20182: API server sets "supervisor" flag now
[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..dbd8b609a943deba2daed811cc52ffdb1dc0c5aa 100644
(file)
--- a/
lib/dispatchcloud/scheduler/fix_stale_locks.go
+++ b/
lib/dispatchcloud/scheduler/fix_stale_locks.go
@@
-7,8
+7,8
@@
package scheduler
import (
"time"
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
)
// 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:
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()
running := sch.pool.Running()
qEntries, _ := sch.queue.Entries()
@@
-43,16
+43,10
@@
waiting:
select {
case <-wp:
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
}
case <-timeout.C:
// Give up.
break waiting
}
-
}
for _, uuid := range stale {
}
for _, uuid := range stale {