From fbab9d05ba94814508dae4745996ae0e525a0e0f Mon Sep 17 00:00:00 2001 From: Victor Vieux Date: Thu, 28 Jan 2016 03:17:34 -0800 Subject: [PATCH] reschedule swarm container only Signed-off-by: Victor Vieux --- cluster/watchdog.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/cluster/watchdog.go b/cluster/watchdog.go index 7c2e067d28..e91a27b0a3 100644 --- a/cluster/watchdog.go +++ b/cluster/watchdog.go @@ -38,6 +38,10 @@ func (w *Watchdog) removeDuplicateContainers(e *Engine) { defer w.Unlock() for _, container := range e.Containers() { + // skip non-swarm containers + if container.Config.SwarmID() == "" { + continue + } for _, containerInCluster := range w.cluster.Containers() { if containerInCluster.Config.SwarmID() == container.Config.SwarmID() && containerInCluster.Engine.ID != container.Engine.ID {