mirror of
https://github.com/moby/moby.git
synced 2026-07-15 03:51:57 +00:00
62bcc6ef50
Commit a0009345f5 updated the default
MaxRecvMsgSize and MaxSendMsgSize for Linux, but did not modify the
defaults for Windows. Those options should not be platform-specific,
which means that the only difference between the Linux and Windows
config are the addresses for GRPC and Debug (Windows defaulting
to a named pipe, whereas Linux sockets within exec-root).
This patch
- implements functions to return the default addresses for each platform
- moves the defaults into `supervisor.Start()`
- removes the now redundant `remote.setDefaults()` method
It's worth noting that prior to this path, `remove.setDefaults()` would
be applied _after_ any (custom) `DaemonOpt` was applied. However, none of
the existing `DaemonOpt` options currently mutates these options. `remote`
is also a non-exported type, so no external implementations can currently
be created. It is therefore safe to set these defaults before options are
applied.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
52 lines
1.1 KiB
Go
52 lines
1.1 KiB
Go
package supervisor // import "github.com/docker/docker/libcontainerd/supervisor"
|
|
|
|
import (
|
|
"os"
|
|
"path/filepath"
|
|
"syscall"
|
|
"time"
|
|
|
|
"github.com/docker/docker/pkg/process"
|
|
)
|
|
|
|
const (
|
|
sockFile = "containerd.sock"
|
|
debugSockFile = "containerd-debug.sock"
|
|
)
|
|
|
|
func defaultGRPCAddress(stateDir string) string {
|
|
return filepath.Join(stateDir, sockFile)
|
|
}
|
|
|
|
func defaultDebugAddress(stateDir string) string {
|
|
return filepath.Join(stateDir, debugSockFile)
|
|
}
|
|
|
|
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 !process.Alive(r.daemonPid) {
|
|
break
|
|
}
|
|
time.Sleep(time.Second)
|
|
}
|
|
|
|
if process.Alive(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)
|
|
_ = process.Kill(r.daemonPid)
|
|
}
|
|
|
|
func (r *remote) platformCleanup() {
|
|
_ = os.Remove(r.Address())
|
|
}
|