dilim/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-08-09 09:33:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #39242 from arkodg/lb-stale-force-leave

Browse Source 
Network not deleted after stack is removed
This commit is contained in:
Sebastiaan van Stijn
2019-05-28 00:31:55 +03:00
committed by GitHub
parent 6899fc094e 70fa7b6a3f
commit c7a0eaf004
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
daemon/cluster/executor/container/controller.go
View File

@@ -369,20 +369,17 @@ func (r *controller) Shutdown(ctx context.Context) error {
}
if err := r.adapter.shutdown(ctx); err != nil {
if isUnknownContainer(err) || isStoppedContainer(err) {
return nil
if !(isUnknownContainer(err) || isStoppedContainer(err)) {
return err
}
return err
}
// Try removing networks referenced in this task in case this
// task is the last one referencing it
if err := r.adapter.removeNetworks(ctx); err != nil {
if isUnknownContainer(err) {
return nil
if !isUnknownContainer(err) {
return err
}
return err
}
return nil