cf7a5be0f2
This patch makes two changes if --oom-score-adj is set to 0 - do not adjust the oom-score-adjust cgroup for dockerd - do not set the hard-coded -999 score for containerd if containerd is running as child process Before this change: oom-score-adj | dockerd | containerd as child-process --------------|---------------|---------------------------- - | -500 | -500 (same as dockerd) -100 | -100 | -100 (same as dockerd) 0 | 0 | -999 (hard-coded default) With this change: oom-score-adj | dockerd | containerd as child-process --------------|---------------|---------------------------- - | -500 | -500 (same as dockerd) -100 | -100 | -100 (same as dockerd) 0 | not adjusted | not adjusted Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
66 lines
1.6 KiB
Go
66 lines
1.6 KiB
Go
package supervisor // import "github.com/docker/docker/libcontainerd/supervisor"
|
|
|
|
import (
|
|
"os"
|
|
"path/filepath"
|
|
"syscall"
|
|
"time"
|
|
|
|
"github.com/containerd/containerd/defaults"
|
|
"github.com/docker/docker/pkg/system"
|
|
)
|
|
|
|
const (
|
|
sockFile = "containerd.sock"
|
|
debugSockFile = "containerd-debug.sock"
|
|
)
|
|
|
|
func (r *remote) setDefaults() {
|
|
if r.GRPC.Address == "" {
|
|
r.GRPC.Address = filepath.Join(r.stateDir, sockFile)
|
|
}
|
|
if r.GRPC.MaxRecvMsgSize == 0 {
|
|
r.GRPC.MaxRecvMsgSize = defaults.DefaultMaxRecvMsgSize
|
|
}
|
|
if r.GRPC.MaxSendMsgSize == 0 {
|
|
r.GRPC.MaxSendMsgSize = defaults.DefaultMaxSendMsgSize
|
|
}
|
|
if r.Debug.Address == "" {
|
|
r.Debug.Address = filepath.Join(r.stateDir, debugSockFile)
|
|
}
|
|
|
|
for key, conf := range r.pluginConfs.Plugins {
|
|
if conf == nil {
|
|
r.DisabledPlugins = append(r.DisabledPlugins, key)
|
|
delete(r.pluginConfs.Plugins, key)
|
|
}
|
|
}
|
|
}
|
|
|
|
func (r *remote) stopDaemon() {
|
|
// Ask the daemon to quit
|
|
syscall.Kill(r.daemonPid, syscall.SIGTERM)
|
|
// Wait up to 15secs for it to stop
|
|
for i := time.Duration(0); i < shutdownTimeout; i += time.Second {
|
|
if !system.IsProcessAlive(r.daemonPid) {
|
|
break
|
|
}
|
|
time.Sleep(time.Second)
|
|
}
|
|
|
|
if system.IsProcessAlive(r.daemonPid) {
|
|
r.logger.WithField("pid", r.daemonPid).Warn("daemon didn't stop within 15 secs, killing it")
|
|
syscall.Kill(r.daemonPid, syscall.SIGKILL)
|
|
}
|
|
}
|
|
|
|
func (r *remote) killDaemon() {
|
|
// Try to get a stack trace
|
|
syscall.Kill(r.daemonPid, syscall.SIGUSR1)
|
|
<-time.After(100 * time.Millisecond)
|
|
system.KillProcess(r.daemonPid)
|
|
}
|
|
|
|
func (r *remote) platformCleanup() {
|
|
os.Remove(filepath.Join(r.stateDir, sockFile))
|
|
}
|