Explorar el Código

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

Network not deleted after stack is removed
Sebastiaan van Stijn hace 6 años
padre
commit
c7a0eaf004
Se han modificado 1 ficheros con 4 adiciones y 7 borrados
  1. 4 7
      daemon/cluster/executor/container/controller.go

+ 4 - 7
daemon/cluster/executor/container/controller.go

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