From 74955e7dd80bbb66bcde3ae86e0e4565f14e921f Mon Sep 17 00:00:00 2001 From: Darren Shepherd Date: Tue, 1 Jan 2019 20:35:45 -0700 Subject: [PATCH] Update FindCgroupMountpointAndRoot to be compatible with newer runc --- pkg/kubelet/cm/util/cgroups_linux.go | 2 +- .../opencontainers/runc/libcontainer/cgroups/utils.go | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/kubelet/cm/util/cgroups_linux.go b/pkg/kubelet/cm/util/cgroups_linux.go index 3dbb5b0e1e..6e87f014a1 100644 --- a/pkg/kubelet/cm/util/cgroups_linux.go +++ b/pkg/kubelet/cm/util/cgroups_linux.go @@ -37,7 +37,7 @@ func GetPids(cgroupPath string) ([]int, error) { func getCgroupPath(cgroupPath string) (string, error) { cgroupPath = libcontainerutils.CleanPath(cgroupPath) - mnt, root, err := libcontainercgroups.FindCgroupMountpointAndRoot("devices") + mnt, root, err := libcontainercgroups.FindCgroupMountpointAndRoot(cgroupPath, "devices") // If we didn't mount the subsystem, there is no point we make the path. if err != nil { return "", err diff --git a/vendor/github.com/opencontainers/runc/libcontainer/cgroups/utils.go b/vendor/github.com/opencontainers/runc/libcontainer/cgroups/utils.go index 7c995efee5..c863b47629 100644 --- a/vendor/github.com/opencontainers/runc/libcontainer/cgroups/utils.go +++ b/vendor/github.com/opencontainers/runc/libcontainer/cgroups/utils.go @@ -23,11 +23,11 @@ const ( // https://www.kernel.org/doc/Documentation/cgroup-v1/cgroups.txt func FindCgroupMountpoint(subsystem string) (string, error) { - mnt, _, err := FindCgroupMountpointAndRoot(subsystem) + mnt, _, err := FindCgroupMountpointAndRoot("", subsystem) return mnt, err } -func FindCgroupMountpointAndRoot(subsystem string) (string, string, error) { +func FindCgroupMountpointAndRoot(_, subsystem string) (string, string, error) { // We are not using mount.GetMounts() because it's super-inefficient, // parsing it directly sped up x10 times because of not using Sscanf. // It was one of two major performance drawbacks in container start. @@ -256,7 +256,7 @@ func GetInitCgroupPath(subsystem string) (string, error) { } func getCgroupPathHelper(subsystem, cgroup string) (string, error) { - mnt, root, err := FindCgroupMountpointAndRoot(subsystem) + mnt, root, err := FindCgroupMountpointAndRoot("", subsystem) if err != nil { return "", err }