1. docker
  2. Commit 2d4bfdc789ad0bb3e7718af06bdc44b42a999433
Browse code

Merge pull request #41081 from thaJeztah/19.03_backport_fix_sandbox_cleanup

[19.03 backport] allocateNetwork: fix network sandbox not cleaned up on failure

Akihiro Suda authored on 2020/07/26 16:17:32
Showing 1 changed files
daemon/container_operations.go
History View file @ 2d4bfdc
... ... 
@@ -509,7 +509,7 @@ func (daemon *Daemon) updateContainerNetworkSettings(container *container.Contai
509 509 
 	}
510 510 
 }
511 511
512 
-func (daemon *Daemon) allocateNetwork(container *container.Container) error {
512 
+func (daemon *Daemon) allocateNetwork(container *container.Container) (retErr error) {
513 513 
 	start := time.Now()
514 514 
 	controller := daemon.netController
515 515
... ... 
@@ -577,7 +577,7 @@ func (daemon *Daemon) allocateNetwork(container *container.Container) error {
577 577 
 			}
578 578 
 			updateSandboxNetworkSettings(container, sb)
579 579 
 			defer func() {
580 
-				if err != nil {
580 
+				if retErr != nil {
581 581 
 					sb.Delete()
582 582 
 				}
583 583 
 			}()