Merge pull request #25111 from coolljt0725/fix_25110

Fix daemon panic on restoring containers Upstream-commit: abf0e9f071c878ed33e84ca5c3cc1fc866f30652 Component: engine
2016-07-27 11:43:45 -04:00
parent cb9f5d85ea e4e65a85a5
commit 156db134e4
1 changed files with 2 additions and 0 deletions
--- a/components/engine/libcontainerd/client_linux.go
+++ b/components/engine/libcontainerd/client_linux.go
@ -563,6 +563,8 @@ func (clnt *client) Restore(containerID string, options ...CreateOption) error {
 		clnt.remote.Lock()
 		return nil
 	}
+	// relock because of the defer
+	clnt.remote.Lock()

 	clnt.deleteContainer(containerID)