github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-04 09:49:50 +00:00
Code Issues Projects Releases Wiki Activity

check containerd as process name instead of docker-containerd

Browse Source 
Signed-off-by: pacoxu <paco.xu@daocloud.io>
This commit is contained in:
pacoxu 2021-01-23 08:26:02 +08:00
parent 94b082550e
commit 89c42bd3d5
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/kubelet/cm/container_manager_linux.go
View File

@ -69,10 +69,10 @@ import (
) )
const ( const (
dockerProcessName = "dockerd" dockerProcessName = "dockerd"
// dockerd option --pidfile can specify path to use for daemon PID file, pid file path is default "/var/run/docker.pid"
dockerPidFile = "/var/run/docker.pid" dockerPidFile = "/var/run/docker.pid"
containerdProcessName = "docker-containerd" containerdProcessName = "containerd"
containerdPidFile = "/run/docker/libcontainerd/docker-containerd.pid"
maxPidFileLength = 1 << 10 // 1KB maxPidFileLength = 1 << 10 // 1KB
) )
@ -841,6 +841,8 @@ func EnsureDockerInContainer(dockerAPIVersion *utilversion.Version, oomScoreAdj
type process struct{ name, file string } type process struct{ name, file string }
dockerProcs := []process{{dockerProcessName, dockerPidFile}} dockerProcs := []process{{dockerProcessName, dockerPidFile}}
if dockerAPIVersion.AtLeast(containerdAPIVersion) { if dockerAPIVersion.AtLeast(containerdAPIVersion) {
// By default containerd is started separately, so there is no pid file.
containerdPidFile := ""
dockerProcs = append(dockerProcs, process{containerdProcessName, containerdPidFile}) dockerProcs = append(dockerProcs, process{containerdProcessName, containerdPidFile})
} }
var errs []error var errs []error