Merge pull request #3610 from Random-Liu/fix-containerd-panic

crosbymichael · web-flow · commit 24f7585ed83b · 2019-09-03T09:57:47.000-04:00
Fix potential containerd panic during graceful shutdown.
diff --git a/cmd/containerd/command/main_unix.go b/cmd/containerd/command/main_unix.go
@@ -58,6 +58,7 @@ func handleSignals(ctx context.Context, signals chan os.Signal, serverC chan *se
 					}
 					server.Stop()
 					close(done)
+					return
 				}
 			}
 		}

Original file line number	Diff line number	Diff line change
`@@ -58,6 +58,7 @@ func handleSignals(ctx context.Context, signals chan os.Signal, serverC chan *se`
`58`	`58`	`}`
`59`	`59`	`server.Stop()`
`60`	`60`	`close(done)`
	`61`	`+ return`
`61`	`62`	`}`
`62`	`63`	`}`
`63`	`64`	`}`