0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #232 from thaJeztah/19.03_backport_lb_stale_force_leave

Browse source 
[19.03 backport] Network not deleted after stack is removed
This commit is contained in:
Sebastiaan van Stijn 2019-05-29 22:47:45 +03:00 • committed by GitHub
commit a62d9b9c21
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 7 deletions
Show stats 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