Merge pull request #232 from thaJeztah/19.03_backport_lb_stale_force_leave
[19.03 backport] Network not deleted after stack is removed
diff --git a/daemon/cluster/executor/container/controller.go b/daemon/cluster/executor/container/controller.go
index ec758c5..dd50a36 100644
--- a/daemon/cluster/executor/container/controller.go
+++ b/daemon/cluster/executor/container/controller.go
@@ -369,20 +369,17 @@
}
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
