From 5c631e04b7d693a6528d072e6371948b1219cf45 Mon Sep 17 00:00:00 2001 From: Daniel Zhang Date: Mon, 26 Sep 2016 10:39:25 +0800 Subject: [PATCH] fix issue26244 Signed-off-by: Daniel Zhang Upstream-commit: 434eae7dfd1612d8de292480d4c31c68fceffa68 Component: engine --- .../daemon/cluster/executor/container/adapter.go | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/components/engine/daemon/cluster/executor/container/adapter.go b/components/engine/daemon/cluster/executor/container/adapter.go index b8531938a7..774333e8a3 100644 --- a/components/engine/daemon/cluster/executor/container/adapter.go +++ b/components/engine/daemon/cluster/executor/container/adapter.go @@ -133,11 +133,15 @@ func (c *containerAdapter) createNetworks(ctx context.Context) error { func (c *containerAdapter) removeNetworks(ctx context.Context) error { for _, nid := range c.container.networks() { if err := c.backend.DeleteManagedNetwork(nid); err != nil { - if _, ok := err.(*libnetwork.ActiveEndpointsError); ok { + switch err.(type) { + case *libnetwork.ActiveEndpointsError: continue + case libnetwork.ErrNoSuchNetwork: + continue + default: + log.G(ctx).Errorf("network %s remove failed: %v", nid, err) + return err } - log.G(ctx).Errorf("network %s remove failed: %v", nid, err) - return err } }