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

Merge pull request #1701 from vieux/reschedule_swarm_only 

remove duplicate container only from swarm
This commit is contained in:
Alexandre Beslic 2016-01-28 15:25:24 -08:00
parent 4ce93c1997 fbab9d05ba
commit 82261a7df4
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cluster/watchdog.go
View File

@ -38,6 +38,10 @@ func (w *Watchdog) removeDuplicateContainers(e *Engine) {
defer w.Unlock() defer w.Unlock()
for _, container := range e.Containers() { for _, container := range e.Containers() {
// skip non-swarm containers
if container.Config.SwarmID() == "" {
continue
}
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 {