github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 17:30:00 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #12885 from dchen1107/docker

Browse Source 
Leave process 1 at root cgroup
This commit is contained in:
Saad Ali 2015-08-19 14:56:52 -07:00
commit fb18b09306
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pkg/kubelet/container_manager_linux.go
View File

@ -137,8 +137,6 @@ func newContainerManager(cadvisorInterface cadvisor.Interface, dockerDaemonConta
systemContainers = append(systemContainers, newSystemContainer(kubeletContainerName)) systemContainers = append(systemContainers, newSystemContainer(kubeletContainerName))
} }
// TODO(vmarmol): Add Kube-proxy container.
return &containerManagerImpl{ return &containerManagerImpl{
systemContainers: systemContainers, systemContainers: systemContainers,
}, nil }, nil
@ -250,8 +248,16 @@ func getContainer(pid int) (string, error) {
return cgroups.ParseCgroupFile("cpu", f) return cgroups.ParseCgroupFile("cpu", f)
} }
// Ensures the system container is created and all non-kernel processes without // Ensures the system container is created and all non-kernel threads and process 1
// a container are moved to it. // without a container are moved to it.
//
// The reason of leaving kernel threads at root cgroup is that we don't want to tie the
// execution of these threads with to-be defined /system quota and create priority inversions.
//
// The reason of leaving process 1 at root cgroup is that libcontainer hardcoded on
// the base cgroup path based on process 1. Please see:
// https://github.com/kubernetes/kubernetes/issues/12789#issuecomment-132384126
// for detail explanation.
func ensureSystemContainer(rootContainer *fs.Manager, manager *fs.Manager) error { func ensureSystemContainer(rootContainer *fs.Manager, manager *fs.Manager) error {
// Move non-kernel PIDs to the system container. // Move non-kernel PIDs to the system container.
attemptsRemaining := 10 attemptsRemaining := 10
@ -267,13 +273,18 @@ func ensureSystemContainer(rootContainer *fs.Manager, manager *fs.Manager) error
continue continue
} }
// Remove kernel pids // Remove kernel pids and process 1
pids := make([]int, 0, len(allPids)) pids := make([]int, 0, len(allPids))
for _, pid := range allPids { for _, pid := range allPids {
if isKernelPid(pid) { if isKernelPid(pid) {
continue continue
} }
// TODO(dawnchen): Remove this once the hard dependency on process 1 is removed
// on systemd node.
if pid == 1 {
continue
}
pids = append(pids, pid) pids = append(pids, pid)
} }
glog.Infof("Found %d PIDs in root, %d of them are kernel related", len(allPids), len(allPids)-len(pids)) glog.Infof("Found %d PIDs in root, %d of them are kernel related", len(allPids), len(allPids)-len(pids))