Browse Source

Merge pull request #25111 from coolljt0725/fix_25110

Fix daemon panic on restoring containers
Brian Goff 9 years ago
parent
commit
abf0e9f071
1 changed files with 2 additions and 0 deletions
  1. 2 0
      libcontainerd/client_linux.go

+ 2 - 0
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)