Browse Source

fix issue26244

Signed-off-by: Daniel Zhang <jmzwcn@gmail.com>
Daniel Zhang 8 years ago
parent
commit
434eae7dfd
1 changed files with 7 additions and 3 deletions
  1. 7 3
      daemon/cluster/executor/container/adapter.go

+ 7 - 3
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 {
 func (c *containerAdapter) removeNetworks(ctx context.Context) error {
 	for _, nid := range c.container.networks() {
 	for _, nid := range c.container.networks() {
 		if err := c.backend.DeleteManagedNetwork(nid); err != nil {
 		if err := c.backend.DeleteManagedNetwork(nid); err != nil {
-			if _, ok := err.(*libnetwork.ActiveEndpointsError); ok {
+			switch err.(type) {
+			case *libnetwork.ActiveEndpointsError:
 				continue
 				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
 		}
 		}
 	}
 	}