github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #1989 from crosbymichael/reaper

Browse Source 
Remove reaper from containerd daemon
This commit is contained in:
Michael Crosby
2018-01-10 18:10:15 -05:00
committed by GitHub
parent bf0236b457 9f5182f394
commit 90553efdef
6 changed files with 6 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
linux/shim/client/client.go
View File

@@ -23,7 +23,6 @@ import (
"github.com/containerd/containerd/linux/shim"
shimapi "github.com/containerd/containerd/linux/shim/v1"
"github.com/containerd/containerd/log"
"github.com/containerd/containerd/reaper"
"github.com/containerd/containerd/sys"
ptypes "github.com/gogo/protobuf/types"
)
@@ -51,8 +50,7 @@ func WithStart(binary, address, daemonAddress, cgroup string, debug bool, exitHa
if err != nil {
return nil, nil, err
}
ec, err := reaper.Default.Start(cmd)
if err != nil {
if err := cmd.Start(); err != nil {
return nil, nil, errors.Wrapf(err, "failed to start shim")
}
defer func() {
@@ -61,7 +59,7 @@ func WithStart(binary, address, daemonAddress, cgroup string, debug bool, exitHa
}
}()
go func() {
reaper.Default.Wait(cmd, ec)
cmd.Wait()
exitHandler()
}()
log.G(ctx).WithFields(logrus.Fields{