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

Merge pull request #96594 from b10s/fix-getcgroupsubsystemsv1

Browse Source 
Fix the getCgroupSubsystemsV1() which uses only the latest record
This commit is contained in:
Kubernetes Prow Robot
2021-02-17 01:25:06 -08:00
committed by GitHub
parent 5ad3b34bde de60340e51
commit 5a382b2d83
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/kubelet/cm/helpers_linux.go
View File

@@ -202,8 +202,16 @@ func getCgroupSubsystemsV1() (*CgroupSubsystems, error) {
} }
mountPoints := make(map[string]string, len(allCgroups)) mountPoints := make(map[string]string, len(allCgroups))
for _, mount := range allCgroups { for _, mount := range allCgroups {
// BEFORE kubelet used a random mount point per cgroups subsystem;
// NOW more deterministic: kubelet use mount point with shortest path;
// FUTURE is bright with clear expectation determined in doc.
// ref. issue: https://github.com/kubernetes/kubernetes/issues/95488
for _, subsystem := range mount.Subsystems { for _, subsystem := range mount.Subsystems {
mountPoints[subsystem] = mount.Mountpoint previous := mountPoints[subsystem]
if previous == "" || len(mount.Mountpoint) < len(previous) {
mountPoints[subsystem] = mount.Mountpoint
}
} }
} }
return &CgroupSubsystems{ return &CgroupSubsystems{