projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '16723-kill-vs-requeue'
[arvados.git]
/
lib
/
dispatchcloud
/
scheduler
/
sync.go
diff --git
a/lib/dispatchcloud/scheduler/sync.go
b/lib/dispatchcloud/scheduler/sync.go
index c047f9b8704f55a15c5181d2faf033a29ba52ff2..fc683505f93dbae41ff42f31032dd2d145d72169 100644
(file)
--- a/
lib/dispatchcloud/scheduler/sync.go
+++ b/
lib/dispatchcloud/scheduler/sync.go
@@
-109,6
+109,10
@@
func (sch *Scheduler) cancel(uuid string, reason string) {
}
func (sch *Scheduler) kill(uuid string, reason string) {
}
func (sch *Scheduler) kill(uuid string, reason string) {
+ if !sch.uuidLock(uuid, "kill") {
+ return
+ }
+ defer sch.uuidUnlock(uuid)
sch.pool.KillContainer(uuid, reason)
sch.pool.ForgetContainer(uuid)
}
sch.pool.KillContainer(uuid, reason)
sch.pool.ForgetContainer(uuid)
}