Merge pull request #727 from mrjana/bugs

mavenugo · mavenugo · commit 47edb73dd3e6 · 2015-10-31T00:16:37.000+01:00
Fix race in host sandbox creation
diff --git a/controller.go b/controller.go
@@ -507,13 +507,14 @@ func (c *controller) NewSandbox(containerID string, options ...SandboxOption) (S
 		return nil, err
 	}
 
+	c.Lock()
 	if sb.osSbox == nil && !sb.config.useExternalKey {
 		if sb.osSbox, err = osl.NewSandbox(sb.Key(), !sb.config.useDefaultSandBox); err != nil {
+			c.Unlock()
 			return nil, fmt.Errorf("failed to create new osl sandbox: %v", err)
 		}
 	}
 
-	c.Lock()
 	c.sandboxes[sb.id] = sb
 	c.Unlock()
 	defer func() {

Original file line number	Diff line number	Diff line change
`@@ -507,13 +507,14 @@ func (c *controller) NewSandbox(containerID string, options ...SandboxOption) (S`
`507`	`507`	`return nil, err`
`508`	`508`	`}`
`509`	`509`
	`510`	`+ c.Lock()`
`510`	`511`	`if sb.osSbox == nil && !sb.config.useExternalKey {`
`511`	`512`	`if sb.osSbox, err = osl.NewSandbox(sb.Key(), !sb.config.useDefaultSandBox); err != nil {`
	`513`	`+ c.Unlock()`
`512`	`514`	`return nil, fmt.Errorf("failed to create new osl sandbox: %v", err)`
`513`	`515`	`}`
`514`	`516`	`}`
`515`	`517`
`516`		`- c.Lock()`
`517`	`518`	`c.sandboxes[sb.id] = sb`
`518`	`519`	`c.Unlock()`
`519`	`520`	`defer func() {`