Fix restore active sandbox

we store the active sandbox after daemon.containerd.Restore, but there is a chance the `Restore` will set the container to exit see (https://github.com/docker/docker/blob/master/libcontainerd/client_linux.go#L469). so we should check if the container is really running before add it to activesandbox. Signed-off-by: Lei Jitang <[email protected]> (cherry picked from commit 78f3094)
gg7 · Jun 17, 2016 · 83fbaa3 · 83fbaa3
1 parent 1ad7b51
commit 83fbaa3
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/daemon/daemon.go b/daemon/daemon.go
@@ -179,7 +179,7 @@ func (daemon *Daemon) restore() error {
 					logrus.Errorf("Failed to restore with containerd: %q", err)
 					return
 				}
-				if !c.HostConfig.NetworkMode.IsContainer() {
+				if !c.HostConfig.NetworkMode.IsContainer() && c.IsRunning() {
 					options, err := daemon.buildSandboxOptions(c)
 					if err != nil {
 						logrus.Warnf("Failed build sandbox option to restore container %s: %v", c.ID, err)