mirror/runc
1
0
Fork 0
mirror of https://github.com/opencontainers/runc.git synced 2026-07-11 06:03:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #562 from cloudfoundry-incubator/avoid-sigchld-hang

Browse Source 
Register signal handlers earlier to avoid zombies
This commit is contained in:
Michael Crosby
2016-02-16 10:55:20 -08:00
parent 2b0a53b9a4 5fbdf6c3fc
commit 15eb206d76
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
restore.go
+2 -2
View File
@@ -134,6 +134,8 @@ func restoreContainer(context *cli.Context, spec *specs.LinuxSpec, config *confi
if err != nil {
return -1, err
}
handler := newSignalHandler(tty)
defer handler.Close()
if err := container.Restore(process, options); err != nil {
tty.Close()
return -1, err
@@ -149,8 +151,6 @@ func restoreContainer(context *cli.Context, spec *specs.LinuxSpec, config *confi
if detach {
return 0, nil
}
handler := newSignalHandler(tty)
defer handler.Close()
return handler.forward(process)
}
utils.go
+3 -2
View File
@@ -307,6 +307,9 @@ func runProcess(container libcontainer.Container, config *specs.Process, listenF
return -1, err
}
handler := newSignalHandler(tty)
defer handler.Close()
if err := container.Start(process); err != nil {
tty.Close()
return -1, err
@@ -323,8 +326,6 @@ func runProcess(container libcontainer.Container, config *specs.Process, listenF
if detach {
return 0, nil
}
handler := newSignalHandler(tty)
defer handler.Close()
return handler.forward(process)
}