Merge pull request #1495 from LK4D4/fix_sb_race

fix race in serializing sandbox to string
moby · Oct 13, 2016 · 393afa7 · 393afa7
2 parents ebfa69e + 93eead6
commit 393afa7
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/controller.go b/controller.go
@@ -882,8 +882,9 @@ func (c *controller) NewSandbox(containerID string, options ...SandboxOption) (s
 		if s.containerID == containerID {
 			// If not a stub, then we already have a complete sandbox.
 			if !s.isStub {
+				sbID := s.ID()
 				c.Unlock()
-				return nil, types.ForbiddenErrorf("container %s is already present: %v", containerID, s)
+				return nil, types.ForbiddenErrorf("container %s is already present in sandbox %s", containerID, sbID)
 			}
 
 			// We already have a stub sandbox from the