From 6783f991c3a7a45ff6b2262d97df2dbb44162b64 Mon Sep 17 00:00:00 2001 From: yameiwang Date: Tue, 10 Mar 2020 06:36:15 +0800 Subject: [PATCH] fix function NodeAllocatableRoot --- cmd/kubelet/app/server.go | 4 ++-- pkg/kubelet/cm/helpers_linux.go | 8 +++++--- pkg/kubelet/cm/helpers_unsupported.go | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/cmd/kubelet/app/server.go b/cmd/kubelet/app/server.go index 7f21273774a..136d0ff8db0 100644 --- a/cmd/kubelet/app/server.go +++ b/cmd/kubelet/app/server.go @@ -608,8 +608,8 @@ func run(s *options.KubeletServer, kubeDeps *kubelet.Dependencies, featureGate f } var cgroupRoots []string - - cgroupRoots = append(cgroupRoots, cm.NodeAllocatableRoot(s.CgroupRoot, s.CgroupDriver)) + nodeAllocatableRoot := cm.NodeAllocatableRoot(s.CgroupRoot, s.CgroupsPerQOS, s.CgroupDriver) + cgroupRoots = append(cgroupRoots, nodeAllocatableRoot) kubeletCgroup, err := cm.GetKubeletContainer(s.KubeletCgroups) if err != nil { klog.Warningf("failed to get the kubelet's cgroup: %v. Kubelet system container metrics may be missing.", err) diff --git a/pkg/kubelet/cm/helpers_linux.go b/pkg/kubelet/cm/helpers_linux.go index f6a1d519026..1db880409dc 100644 --- a/pkg/kubelet/cm/helpers_linux.go +++ b/pkg/kubelet/cm/helpers_linux.go @@ -238,9 +238,11 @@ func GetPodCgroupNameSuffix(podUID types.UID) string { } // NodeAllocatableRoot returns the literal cgroup path for the node allocatable cgroup -func NodeAllocatableRoot(cgroupRoot, cgroupDriver string) string { - root := ParseCgroupfsToCgroupName(cgroupRoot) - nodeAllocatableRoot := NewCgroupName(root, defaultNodeAllocatableCgroupName) +func NodeAllocatableRoot(cgroupRoot string, cgroupsPerQOS bool, cgroupDriver string) string { + nodeAllocatableRoot := ParseCgroupfsToCgroupName(cgroupRoot) + if cgroupsPerQOS { + nodeAllocatableRoot = NewCgroupName(nodeAllocatableRoot, defaultNodeAllocatableCgroupName) + } if libcontainerCgroupManagerType(cgroupDriver) == libcontainerSystemd { return nodeAllocatableRoot.ToSystemd() } diff --git a/pkg/kubelet/cm/helpers_unsupported.go b/pkg/kubelet/cm/helpers_unsupported.go index f8b6fd31b0d..fe9d532beb9 100644 --- a/pkg/kubelet/cm/helpers_unsupported.go +++ b/pkg/kubelet/cm/helpers_unsupported.go @@ -61,7 +61,7 @@ func GetPodCgroupNameSuffix(podUID types.UID) string { } // NodeAllocatableRoot returns the literal cgroup path for the node allocatable cgroup -func NodeAllocatableRoot(cgroupRoot, cgroupDriver string) string { +func NodeAllocatableRoot(cgroupRoot string, cgroupsPerQOS bool, cgroupDriver string) string { return "" }