Merge pull request #2940 from keloyang/destroy-stable-1.11

amshinde · web-flow · commit eb34521b8b9b · 2020-11-08T21:09:24.000-08:00
runtime: Call s.newStore.Destroy if globalSandboxList.addSandbox
diff --git a/virtcontainers/sandbox.go b/virtcontainers/sandbox.go
@@ -545,6 +545,7 @@ func newSandbox(ctx context.Context, sandboxConfig SandboxConfig, factory Factor
 	}
 
 	if err = globalSandboxList.addSandbox(s); err != nil {
+		s.newStore.Destroy(s.id)
 		return nil, err
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -545,6 +545,7 @@ func newSandbox(ctx context.Context, sandboxConfig SandboxConfig, factory Factor`
`545`	`545`	`}`
`546`	`546`
`547`	`547`	`if err = globalSandboxList.addSandbox(s); err != nil {`
	`548`	`+ s.newStore.Destroy(s.id)`
`548`	`549`	`return nil, err`
`549`	`550`	`}`
`550`	`551`