Merge pull request #1907 from Random-Liu/fix-deadlock

Fix a containerd deadlock.
This commit is contained in:
Michael Crosby 2017-12-12 10:38:19 -05:00 committed by GitHub
commit cb423f8360
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -78,7 +78,7 @@ func main() {
var ( var (
start = time.Now() start = time.Now()
signals = make(chan os.Signal, 2048) signals = make(chan os.Signal, 2048)
serverC = make(chan *server.Server) serverC = make(chan *server.Server, 1)
ctx = log.WithModule(gocontext.Background(), "containerd") ctx = log.WithModule(gocontext.Background(), "containerd")
config = defaultConfig() config = defaultConfig()
) )