浏览代码

Merge pull request #1495 from LK4D4/fix_sb_race

fix race in serializing sandbox to string
Santhosh Manohar 8 年之前
父节点
当前提交
3696adb39e
共有 1 个文件被更改,包括 2 次插入1 次删除
  1. 2 1
      libnetwork/controller.go

+ 2 - 1
libnetwork/controller.go

@@ -882,8 +882,9 @@ func (c *controller) NewSandbox(containerID string, options ...SandboxOption) (s
 		if s.containerID == containerID {
 		if s.containerID == containerID {
 			// If not a stub, then we already have a complete sandbox.
 			// If not a stub, then we already have a complete sandbox.
 			if !s.isStub {
 			if !s.isStub {
+				sbID := s.ID()
 				c.Unlock()
 				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
 			// We already have a stub sandbox from the