Merge pull request moby#29015 from coolljt0725/fix_restore_panic

tonistiigi · web-flow · commit 0a5cb187b4df · 2016-12-01T08:38:02.000-08:00
Fix docker restart panic on machine ungracefully shutdown
diff --git a/libcontainerd/client_linux.go b/libcontainerd/client_linux.go
@@ -454,7 +454,7 @@ func (clnt *client) Restore(containerID string, attachStdio StdioCallback, optio
 		if err != nil {
 			logrus.Warnf("libcontainerd: failed to retrieve container %s state: %v", containerID, err)
 		}
-		if ev != nil && ev.Pid != InitFriendlyName || ev.Type != StateExit {
+		if ev != nil && (ev.Pid != InitFriendlyName || ev.Type != StateExit) {
 			// Wait a while for the exit event
 			timeout := time.NewTimer(10 * time.Second)
 			tick := time.NewTicker(100 * time.Millisecond)

Original file line number	Diff line number	Diff line change
`@@ -454,7 +454,7 @@ func (clnt *client) Restore(containerID string, attachStdio StdioCallback, optio`
`454`	`454`	`if err != nil {`
`455`	`455`	`logrus.Warnf("libcontainerd: failed to retrieve container %s state: %v", containerID, err)`
`456`	`456`	`}`
`457`		`- if ev != nil && ev.Pid != InitFriendlyName \|\| ev.Type != StateExit {`
	`457`	`+ if ev != nil && (ev.Pid != InitFriendlyName \|\| ev.Type != StateExit) {`
`458`	`458`	`// Wait a while for the exit event`
`459`	`459`	`timeout := time.NewTimer(10 * time.Second)`
`460`	`460`	`tick := time.NewTicker(100 * time.Millisecond)`