docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix daemon panic on restoring containers 

Signed-off-by: Lei Jitang <leijitang@huawei.com>
(cherry picked from commit c75de8e33cc0db5236eef6146f2de06533b46aa8)
Signed-off-by: Tibor Vass <tibor@docker.com>
This commit is contained in:
Lei Jitang 2016-07-26 22:51:03 -04:00 committed by Tibor Vass
parent cda10d4d7f
commit c46db363d6
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libcontainerd/client_linux.go
View File

@ -563,6 +563,8 @@ func (clnt *client) Restore(containerID string, options ...CreateOption) error {
clnt.remote.Lock() clnt.remote.Lock()
return nil return nil
} }
// relock because of the defer
clnt.remote.Lock()
clnt.deleteContainer(containerID) clnt.deleteContainer(containerID)