projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '20188-insufficient-subnet'
[arvados.git]
/
lib
/
dispatchcloud
/
scheduler
/
sync.go
diff --git
a/lib/dispatchcloud/scheduler/sync.go
b/lib/dispatchcloud/scheduler/sync.go
index 038b4c8c5f0cb3a04aa08eddc843ac7564d9913f..4d601d6ae834dfeb242a8328dd4c62d79959d46e 100644
(file)
--- a/
lib/dispatchcloud/scheduler/sync.go
+++ b/
lib/dispatchcloud/scheduler/sync.go
@@
-66,7
+66,7
@@
func (sch *Scheduler) sync() {
// a network outage and is still
// preparing to run a container that
// has already been unlocked/requeued.
// a network outage and is still
// preparing to run a container that
// has already been unlocked/requeued.
- go sch.kill(uuid, fmt.Sprintf("state=%s", ent.Container.State))
+ go sch.kill(uuid, fmt.Sprintf("
pool says running, but queue says
state=%s", ent.Container.State))
} else if ent.Container.Priority == 0 {
sch.logger.WithFields(logrus.Fields{
"ContainerUUID": uuid,
} else if ent.Container.Priority == 0 {
sch.logger.WithFields(logrus.Fields{
"ContainerUUID": uuid,
@@
-118,6
+118,10
@@
func (sch *Scheduler) kill(uuid string, reason string) {
return
}
defer sch.uuidUnlock(uuid)
return
}
defer sch.uuidUnlock(uuid)
+ sch.logger.WithFields(logrus.Fields{
+ "ContainerUUID": uuid,
+ "reason": reason,
+ }).Debug("kill")
sch.pool.KillContainer(uuid, reason)
sch.pool.ForgetContainer(uuid)
}
sch.pool.KillContainer(uuid, reason)
sch.pool.ForgetContainer(uuid)
}