kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #41020 from thaJeztah/fix_sandbox_cleanup

Browse source 
allocateNetwork: fix network sandbox not cleaned up on failure
This commit is contained in:
Tibor Vass 2020-06-05 09:55:54 -07:00 • committed by GitHub
commit 5ffd677824
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
daemon/container_operations.go
View file

@ -526,14 +526,16 @@ func (daemon *Daemon) updateContainerNetworkSettings(container *container.Contai
} }
} }
func (daemon *Daemon) allocateNetwork(container *container.Container) error { func (daemon *Daemon) allocateNetwork(container *container.Container) (retErr error) {
start := time.Now()
controller := daemon.netController
if daemon.netController == nil { if daemon.netController == nil {
return nil return nil
} }
var (
start = time.Now()
controller = daemon.netController
)
// Cleanup any stale sandbox left over due to ungraceful daemon shutdown // Cleanup any stale sandbox left over due to ungraceful daemon shutdown
if err := controller.SandboxDestroy(container.ID); err != nil { if err := controller.SandboxDestroy(container.ID); err != nil {
logrus.WithError(err).Errorf("failed to cleanup up stale network sandbox for container %s", container.ID) logrus.WithError(err).Errorf("failed to cleanup up stale network sandbox for container %s", container.ID)
@ -594,7 +596,7 @@ func (daemon *Daemon) allocateNetwork(container *container.Container) error {
} }
updateSandboxNetworkSettings(container, sb) updateSandboxNetworkSettings(container, sb)
defer func() { defer func() {
if err != nil { if retErr != nil {
sb.Delete() sb.Delete()
} }
}() }()