docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2074 from allencloud/log-err-when-remove-fails-in-rescheduling 

log err when remove container fails in rescheduling
This commit is contained in:
Victor Vieux 2016-04-06 11:13:05 -07:00
parent ba9b348bda b6f646cacd
commit e7077ff5e3
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cluster/watchdog.go
View File

@ -45,9 +45,11 @@ func (w *Watchdog) removeDuplicateContainers(e *Engine) {
for _, containerInCluster := range w.cluster.Containers() { for _, containerInCluster := range w.cluster.Containers() {
if containerInCluster.Config.SwarmID() == container.Config.SwarmID() && containerInCluster.Engine.ID != container.Engine.ID { if containerInCluster.Config.SwarmID() == container.Config.SwarmID() && containerInCluster.Engine.ID != container.Engine.ID {
log.Debugf("container %s was rescheduled on node %s, removing it", container.Id, containerInCluster.Engine.ID) log.Debugf("container %s was rescheduled on node %s, removing it", container.Id, containerInCluster.Engine.Name)
// container already exists in the cluster, destroy it // container already exists in the cluster, destroy it
e.RemoveContainer(container, true, true) if err := e.RemoveContainer(container, true, true); err != nil {
log.Errorf("Failed to remove duplicate container %s on node %s: %v", container.Id, containerInCluster.Engine.Name, err)
}
} }
} }
} }