vbatts/containerd
1
0
Fork 0
Code Pull requests Releases Activity

Add reaper code for daemon

Browse source 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
This commit is contained in:
Michael Crosby 2017-03-09 16:07:35 -08:00
parent 4fd2478513
commit df48983fe7
4 changed files with 109 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
cmd/containerd/main.go
View file

@ -21,6 +21,7 @@ import (
"github.com/docker/containerd/content"
"github.com/docker/containerd/log"
"github.com/docker/containerd/plugin"
"github.com/docker/containerd/reaper"
"github.com/docker/containerd/snapshot"
"github.com/docker/containerd/utils"
metrics "github.com/docker/go-metrics"
@ -83,7 +84,7 @@ func main() {
// start the signal handler as soon as we can to make sure that
// we don't miss any signals during boot
signals := make(chan os.Signal, 2048)
signal.Notify(signals, syscall.SIGTERM, syscall.SIGINT, syscall.SIGUSR1)
signal.Notify(signals, syscall.SIGTERM, syscall.SIGINT, syscall.SIGUSR1, syscall.SIGCHLD)
log.G(global).Info("starting containerd boot...")
// load all plugins into containerd
@ -363,6 +364,10 @@ func handleSignals(signals chan os.Signal, server *grpc.Server) error {
for s := range signals {
log.G(global).WithField("signal", s).Debug("received signal")
switch s {
case syscall.SIGCHLD:
if err := reaper.Reap(); err != nil {
log.G(global).WithError(err).Error("reap containerd processes")
}
default:
server.Stop()
return nil