kotovalexarian-likes-github
/
moby--moby
mirror of https://github.com/moby/moby.git
1
0
Fork 0
Code Releases Activity

Merge pull request #26896 from jmzwcn/issue26244 

Fix issue26244:swarm service, with overlay network, fails to remove all containers
This commit is contained in:
Sebastiaan van Stijn 2016-10-11 14:40:39 +02:00 committed by GitHub
parent 6b997739fe 434eae7dfd
commit f7d1682c60
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
daemon/cluster/executor/container/adapter.go
View File

@ -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
}
}