From 6e9f24b71129ea9457ad707b0880a8277232ab3b Mon Sep 17 00:00:00 2001 From: Michael Crosby Date: Tue, 28 Nov 2017 17:04:21 -0500 Subject: [PATCH] Change default subreaper setting This subreaper should always be turned on for containerd unless explicitly needed for it to be off. Signed-off-by: Michael Crosby --- cmd/containerd/config_linux.go | 2 +- server/config.go | 4 ++-- server/server_linux.go | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cmd/containerd/config_linux.go b/cmd/containerd/config_linux.go index 6e720c23e..8d7eb058f 100644 --- a/cmd/containerd/config_linux.go +++ b/cmd/containerd/config_linux.go @@ -12,7 +12,7 @@ func defaultConfig() *server.Config { GRPC: server.GRPCConfig{ Address: defaults.DefaultAddress, }, - Subreaper: true, + NoSubreaper: false, Debug: server.Debug{ Level: "info", Address: defaults.DefaultDebugAddress, diff --git a/server/config.go b/server/config.go index 26af539ac..f056c7b83 100644 --- a/server/config.go +++ b/server/config.go @@ -23,8 +23,8 @@ type Config struct { Metrics MetricsConfig `toml:"metrics"` // Plugins provides plugin specific configuration for the initialization of a plugin Plugins map[string]toml.Primitive `toml:"plugins"` - // Enable containerd as a subreaper - Subreaper bool `toml:"subreaper"` + // NoSubreaper disables containerd as a subreaper + NoSubreaper bool `toml:"no_subreaper"` // OOMScore adjust the containerd's oom score OOMScore int `toml:"oom_score"` // Cgroup specifies cgroup information for the containerd daemon process diff --git a/server/server_linux.go b/server/server_linux.go index 03244e90d..f6f679cc9 100644 --- a/server/server_linux.go +++ b/server/server_linux.go @@ -12,7 +12,7 @@ import ( // apply sets config settings on the server process func apply(ctx context.Context, config *Config) error { - if config.Subreaper { + if !config.NoSubreaper { log.G(ctx).Info("setting subreaper...") if err := sys.SetSubreaper(1); err != nil { return err