From 34f4304a71e8571812caaac4fe68e37dbd04812a Mon Sep 17 00:00:00 2001 From: Alessandro Boch Date: Tue, 28 Mar 2017 13:09:45 -0700 Subject: [PATCH] Sandbox.SetKey() should not reset the osl sandbox on failure Because the failure would not be on creating the osl sandbox (which is done by somebody else). It would be on the programming libnetwork does on the osl sandbox. In case of failure just report the error. External caller will take care of removing the parent sandbox via the cleanup on the error handling path. Otherwise the osl sandbox will never be removed. Signed-off-by: Alessandro Boch --- libnetwork/sandbox.go | 7 ------- 1 file changed, 7 deletions(-) diff --git a/libnetwork/sandbox.go b/libnetwork/sandbox.go index a2811af62e..c820cc04e9 100644 --- a/libnetwork/sandbox.go +++ b/libnetwork/sandbox.go @@ -644,13 +644,6 @@ func (sb *sandbox) SetKey(basePath string) error { sb.Lock() sb.osSbox = osSbox sb.Unlock() - defer func() { - if err != nil { - sb.Lock() - sb.osSbox = nil - sb.Unlock() - } - }() // If the resolver was setup before stop it and set it up in the // new osl sandbox.