Handle restore with dead shim

Add functionality for restoring containers after containerd dies and is
restarted with terminated shims.

This ensures that on restore, if a container no longer has a running
shim, containerd will kill and cleanup the container.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
This commit is contained in:
Michael Crosby
2017-04-06 18:22:30 -07:00
parent c1325a5aa9
commit 7482962b9d
4 changed files with 53 additions and 8 deletions

View File

@@ -60,9 +60,6 @@ func loadShim(path string, remote bool) (shim.ShimClient, error) {
}
socket := filepath.Join(path, "shim.sock")
return connectShim(socket)
// TODO: failed to connect to the shim, check if it's alive
// - if it is kill it
// - in both case call runc killall and runc delete on the id
}
func connectShim(socket string) (shim.ShimClient, error) {