Merge pull request #1913 from Random-Liu/cherry-pick-#1907

estesp · web-flow · commit dba5fa072091 · 2017-12-13T12:34:35.000-05:00
[Cherrypick] Fix containerd deadlock.
diff --git a/cmd/containerd/main.go b/cmd/containerd/main.go
@@ -78,7 +78,7 @@ func main() {
 		var (
 			start   = time.Now()
 			signals = make(chan os.Signal, 2048)
-			serverC = make(chan *server.Server)
+			serverC = make(chan *server.Server, 1)
 			ctx     = log.WithModule(gocontext.Background(), "containerd")
 			config  = defaultConfig()
 		)

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ func main() {`
`78`	`78`	`var (`
`79`	`79`	`start = time.Now()`
`80`	`80`	`signals = make(chan os.Signal, 2048)`
`81`		`- serverC = make(chan *server.Server)`
	`81`	`+ serverC = make(chan *server.Server, 1)`
`82`	`82`	`ctx = log.WithModule(gocontext.Background(), "containerd")`
`83`	`83`	`config = defaultConfig()`
`84`	`84`	`)`