vbatts/cri-o
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

server: remove reaper, let runc take care of reaping

Browse source 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
This commit is contained in:
Antonio Murdaca 2016-12-14 12:15:20 +01:00
parent 4cb5af00f6
commit d2f6a4c0e2
No known key found for this signature in database
GPG key ID: B2BEAD150DE936B9
3 changed files with 2 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

9
server/server.go
View file

@ -15,7 +15,6 @@ import (
"github.com/kubernetes-incubator/cri-o/oci"
"github.com/kubernetes-incubator/cri-o/server/apparmor"
"github.com/kubernetes-incubator/cri-o/server/seccomp"
"github.com/kubernetes-incubator/cri-o/utils"
"github.com/opencontainers/runc/libcontainer/label"
rspec "github.com/opencontainers/runtime-spec/specs-go"
"github.com/rajatchopra/ocicni"
@ -297,14 +296,6 @@ func seccompEnabled() bool {
// New creates a new Server with options provided
func New(config *Config) (*Server, error) {
// TODO: This will go away later when we have wrapper process or systemd acting as
// subreaper.
if err := utils.SetSubreaper(1); err != nil {
return nil, fmt.Errorf("failed to set server as subreaper: %v", err)
}
utils.StartReaper()
if err := os.MkdirAll(config.ImageDir, 0755); err != nil {
return nil, err
}