cgroup cleanups

cmd/internal/container/mesos/factory.go

@@ -46,7 +46,7 @@ type mesosFactory struct {
 	machineInfoFactory info.MachineInfoFactory
 
 	// Information about the cgroup subsystems.
-	cgroupSubsystems libcontainer.CgroupSubsystems
+	cgroupSubsystems map[string]string
 
 	// Information about mounted filesystems.
 	fsInfo fs.FsInfo
@@ -68,7 +68,7 @@ func (f *mesosFactory) NewContainerHandler(name string, metadataEnvAllowList []s
 
 	return newMesosContainerHandler(
 		name,
-		&f.cgroupSubsystems,
+		f.cgroupSubsystems,
 		f.machineInfoFactory,
 		f.fsInfo,
 		f.includedMetrics,

cmd/internal/container/mesos/factory_test.go

@@ -19,8 +19,6 @@ import (
 
 	mesos "github.com/mesos/mesos-go/api/v1/lib"
 	"github.com/stretchr/testify/assert"
-
-	containerlibcontainer "github.com/google/cadvisor/container/libcontainer"
 )
 
 func TestIsContainerName(t *testing.T) {
@@ -59,7 +57,7 @@ func TestCanHandleAndAccept(t *testing.T) {
 
 	f := &mesosFactory{
 		machineInfoFactory: nil,
-		cgroupSubsystems:   containerlibcontainer.CgroupSubsystems{},
+		cgroupSubsystems:   nil,
 		fsInfo:             nil,
 		includedMetrics:    nil,
 		client:             fakeMesosAgentClient(testContainers, nil),

cmd/internal/container/mesos/handler.go

@@ -52,15 +52,15 @@ type mesosContainerHandler struct {
 
 func newMesosContainerHandler(
 	name string,
-	cgroupSubsystems *containerlibcontainer.CgroupSubsystems,
+	cgroupSubsystems map[string]string,
 	machineInfoFactory info.MachineInfoFactory,
 	fsInfo fs.FsInfo,
 	includedMetrics container.MetricSet,
 	inHostNamespace bool,
 	metadataEnvAllowList []string,
 	client mesosAgentClient,
 ) (container.ContainerHandler, error) {
-	cgroupPaths := common.MakeCgroupPaths(cgroupSubsystems.MountPoints, name)
+	cgroupPaths := common.MakeCgroupPaths(cgroupSubsystems, name)
 
 	// Generate the equivalent cgroup manager for this container.
 	cgroupManager, err := containerlibcontainer.NewCgroupManager(name, cgroupPaths)

cmd/internal/container/mesos/handler_test.go

@@ -22,7 +22,6 @@ import (
 	"github.com/stretchr/testify/assert"
 
 	"github.com/google/cadvisor/container"
-	containerlibcontainer "github.com/google/cadvisor/container/libcontainer"
 	"github.com/google/cadvisor/fs"
 	info "github.com/google/cadvisor/info/v1"
 )
@@ -42,7 +41,7 @@ func TestContainerReference(t *testing.T) {
 		name                 string
 		machineInfoFactory   info.MachineInfoFactory
 		fsInfo               fs.FsInfo
-		cgroupSubsystems     *containerlibcontainer.CgroupSubsystems
+		cgroupSubsystems     map[string]string
 		inHostNamespace      bool
 		metadataEnvAllowList []string
 		includedMetrics      container.MetricSet
@@ -57,7 +56,7 @@ func TestContainerReference(t *testing.T) {
 			"/mesos/04e20821-67d3-4bf7-96b4-7d4495f50b28",
 			nil,
 			nil,
-			&containerlibcontainer.CgroupSubsystems{},
+			nil,
 			false,
 			[]string{},
 			nil,
@@ -71,7 +70,7 @@ func TestContainerReference(t *testing.T) {
 			"/mesos/04e20821-67d3-4bf7-96b4-7d4495f50b28",
 			nil,
 			nil,
-			&containerlibcontainer.CgroupSubsystems{},
+			nil,
 			false,
 			[]string{},
 			nil,
@@ -85,7 +84,7 @@ func TestContainerReference(t *testing.T) {
 			"/mesos/04e20821-67d3-4bf7-96b4-7d4495f50b28",
 			nil,
 			nil,
-			&containerlibcontainer.CgroupSubsystems{},
+			nil,
 			false,
 			[]string{},
 			nil,

container/containerd/factory.go

@@ -48,7 +48,7 @@ type containerdFactory struct {
 	client             ContainerdClient
 	version            string
 	// Information about the mounted cgroup subsystems.
-	cgroupSubsystems libcontainer.CgroupSubsystems
+	cgroupSubsystems map[string]string
 	// Information about mounted filesystems.
 	fsInfo          fs.FsInfo
 	includedMetrics container.MetricSet
@@ -76,7 +76,7 @@ func (f *containerdFactory) NewContainerHandler(name string, metadataEnvAllowLis
 		name,
 		f.machineInfoFactory,
 		f.fsInfo,
-		&f.cgroupSubsystems,
+		f.cgroupSubsystems,
 		inHostNamespace,
 		containerdMetadataEnvAllowList,
 		f.includedMetrics,

container/containerd/factory_test.go

@@ -21,8 +21,6 @@ import (
 	"github.com/containerd/typeurl"
 	specs "github.com/opencontainers/runtime-spec/specs-go"
 	"github.com/stretchr/testify/assert"
-
-	containerlibcontainer "github.com/google/cadvisor/container/libcontainer"
 )
 
 func TestIsContainerName(t *testing.T) {
@@ -59,7 +57,7 @@ func TestCanHandleAndAccept(t *testing.T) {
 
 	f := &containerdFactory{
 		client:             mockcontainerdClient(testContainers, nil),
-		cgroupSubsystems:   containerlibcontainer.CgroupSubsystems{},
+		cgroupSubsystems:   nil,
 		fsInfo:             nil,
 		machineInfoFactory: nil,
 		includedMetrics:    nil,

container/containerd/handler.go

@@ -22,6 +22,7 @@ import (
 	"time"
 
 	"github.com/containerd/containerd/errdefs"
+	"github.com/opencontainers/runc/libcontainer/cgroups"
 	"golang.org/x/net/context"
 
 	specs "github.com/opencontainers/runtime-spec/specs-go"
@@ -59,13 +60,13 @@ func newContainerdContainerHandler(
 	name string,
 	machineInfoFactory info.MachineInfoFactory,
 	fsInfo fs.FsInfo,
-	cgroupSubsystems *containerlibcontainer.CgroupSubsystems,
+	cgroupSubsystems map[string]string,
 	inHostNamespace bool,
 	metadataEnvAllowList []string,
 	includedMetrics container.MetricSet,
 ) (container.ContainerHandler, error) {
 	// Create the cgroup paths.
-	cgroupPaths := common.MakeCgroupPaths(cgroupSubsystems.MountPoints, name)
+	cgroupPaths := common.MakeCgroupPaths(cgroupSubsystems, name)
 
 	// Generate the equivalent cgroup manager for this container.
 	cgroupManager, err := containerlibcontainer.NewCgroupManager(name, cgroupPaths)
@@ -216,7 +217,11 @@ func (h *containerdContainerHandler) ListContainers(listType container.ListType)
 }
 
 func (h *containerdContainerHandler) GetCgroupPath(resource string) (string, error) {
-	path, ok := h.cgroupPaths[resource]
+	var res string
+	if !cgroups.IsCgroup2UnifiedMode() {
+		res = resource
+	}
+	path, ok := h.cgroupPaths[res]
 	if !ok {
 		return "", fmt.Errorf("could not find path for resource %q for container %q", resource, h.reference.Name)
 	}

container/containerd/handler_test.go

@@ -24,7 +24,6 @@ import (
 	"github.com/stretchr/testify/assert"
 
 	"github.com/google/cadvisor/container"
-	containerlibcontainer "github.com/google/cadvisor/container/libcontainer"
 	"github.com/google/cadvisor/fs"
 	info "github.com/google/cadvisor/info/v1"
 )
@@ -50,7 +49,7 @@ func TestHandler(t *testing.T) {
 		name                 string
 		machineInfoFactory   info.MachineInfoFactory
 		fsInfo               fs.FsInfo
-		cgroupSubsystems     *containerlibcontainer.CgroupSubsystems
+		cgroupSubsystems     map[string]string
 		inHostNamespace      bool
 		metadataEnvAllowList []string
 		includedMetrics      container.MetricSet
@@ -74,7 +73,7 @@ func TestHandler(t *testing.T) {
 			"/kubepods/pod068e8fa0-9213-11e7-a01f-507b9d4141fa/40af7cdcbe507acad47a5a62025743ad3ddc6ab93b77b21363aa1c1d641047c9",
 			nil,
 			nil,
-			&containerlibcontainer.CgroupSubsystems{},
+			nil,
 			false,
 			nil,
 			nil,
@@ -88,7 +87,7 @@ func TestHandler(t *testing.T) {
 			"/kubepods/pod068e8fa0-9213-11e7-a01f-507b9d4141fa/40af7cdcbe507acad47a5a62025743ad3ddc6ab93b77b21363aa1c1d641047c9",
 			&mockedMachineInfo{},
 			nil,
-			&containerlibcontainer.CgroupSubsystems{},
+			nil,
 			false,
 			nil,
 			nil,
@@ -107,7 +106,7 @@ func TestHandler(t *testing.T) {
 			"/kubepods/pod068e8fa0-9213-11e7-a01f-507b9d4141fa/40af7cdcbe507acad47a5a62025743ad3ddc6ab93b77b21363aa1c1d641047c9",
 			&mockedMachineInfo{},
 			nil,
-			&containerlibcontainer.CgroupSubsystems{},
+			nil,
 			false,
 			[]string{"TEST"},
 			nil,

container/crio/factory.go

@@ -50,7 +50,7 @@ type crioFactory struct {
 	storageDir    string
 
 	// Information about the mounted cgroup subsystems.
-	cgroupSubsystems libcontainer.CgroupSubsystems
+	cgroupSubsystems map[string]string
 
 	// Information about mounted filesystems.
 	fsInfo fs.FsInfo
@@ -76,7 +76,7 @@ func (f *crioFactory) NewContainerHandler(name string, metadataEnvAllowList []st
 		f.fsInfo,
 		f.storageDriver,
 		f.storageDir,
-		&f.cgroupSubsystems,
+		f.cgroupSubsystems,
 		inHostNamespace,
 		metadataEnvAllowList,
 		f.includedMetrics,

container/crio/factory_test.go

@@ -18,15 +18,13 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-
-	containerlibcontainer "github.com/google/cadvisor/container/libcontainer"
 )
 
 func TestCanHandleAndAccept(t *testing.T) {
 	as := assert.New(t)
 	f := &crioFactory{
 		client:             nil,
-		cgroupSubsystems:   containerlibcontainer.CgroupSubsystems{},
+		cgroupSubsystems:   nil,
 		fsInfo:             nil,
 		machineInfoFactory: nil,
 		storageDriver:      "",

container/crio/handler.go

@@ -84,13 +84,13 @@ func newCrioContainerHandler(
 	fsInfo fs.FsInfo,
 	storageDriver storageDriver,
 	storageDir string,
-	cgroupSubsystems *containerlibcontainer.CgroupSubsystems,
+	cgroupSubsystems map[string]string,
 	inHostNamespace bool,
 	metadataEnvAllowList []string,
 	includedMetrics container.MetricSet,
 ) (container.ContainerHandler, error) {
 	// Create the cgroup paths.
-	cgroupPaths := common.MakeCgroupPaths(cgroupSubsystems.MountPoints, name)
+	cgroupPaths := common.MakeCgroupPaths(cgroupSubsystems, name)
 
 	// Generate the equivalent cgroup manager for this container.
 	cgroupManager, err := containerlibcontainer.NewCgroupManager(name, cgroupPaths)
@@ -328,7 +328,11 @@ func (h *crioContainerHandler) ListContainers(listType container.ListType) ([]in
 }
 
 func (h *crioContainerHandler) GetCgroupPath(resource string) (string, error) {
-	path, ok := h.cgroupPaths[resource]
+	var res string
+	if !cgroups.IsCgroup2UnifiedMode() {
+		res = resource
+	}
+	path, ok := h.cgroupPaths[res]
 	if !ok {
 		return "", fmt.Errorf("could not find path for resource %q for container %q", resource, h.reference.Name)
 	}

container/crio/handler_test.go

@@ -21,7 +21,6 @@ import (
 	"github.com/stretchr/testify/assert"
 
 	"github.com/google/cadvisor/container"
-	containerlibcontainer "github.com/google/cadvisor/container/libcontainer"
 	"github.com/google/cadvisor/fs"
 	info "github.com/google/cadvisor/info/v1"
 )
@@ -35,7 +34,7 @@ func TestHandler(t *testing.T) {
 		fsInfo               fs.FsInfo
 		storageDriver        storageDriver
 		storageDir           string
-		cgroupSubsystems     *containerlibcontainer.CgroupSubsystems
+		cgroupSubsystems     map[string]string
 		inHostNamespace      bool
 		metadataEnvAllowList []string
 		includedMetrics      container.MetricSet
@@ -52,7 +51,7 @@ func TestHandler(t *testing.T) {
 			nil,
 			"",
 			"",
-			&containerlibcontainer.CgroupSubsystems{},
+			nil,
 			false,
 			nil,
 			nil,
@@ -68,7 +67,7 @@ func TestHandler(t *testing.T) {
 			nil,
 			"",
 			"",
-			&containerlibcontainer.CgroupSubsystems{},
+			nil,
 			false,
 			nil,
 			nil,
@@ -88,7 +87,7 @@ func TestHandler(t *testing.T) {
 			nil,
 			"",
 			"",
-			&containerlibcontainer.CgroupSubsystems{},
+			nil,
 			false,
 			nil,
 			nil,

container/docker/factory.go

@@ -116,7 +116,7 @@ type dockerFactory struct {
 	client *docker.Client
 
 	// Information about the mounted cgroup subsystems.
-	cgroupSubsystems libcontainer.CgroupSubsystems
+	cgroupSubsystems map[string]string
 
 	// Information about mounted filesystems.
 	fsInfo fs.FsInfo
@@ -157,7 +157,7 @@ func (f *dockerFactory) NewContainerHandler(name string, metadataEnvAllowList []
 		f.fsInfo,
 		f.storageDriver,
 		f.storageDir,
-		&f.cgroupSubsystems,
+		f.cgroupSubsystems,
 		inHostNamespace,
 		dockerMetadataEnvAllowList,
 		f.dockerVersion,

container/docker/handler.go

@@ -31,6 +31,7 @@ import (
 	"github.com/google/cadvisor/fs"
 	info "github.com/google/cadvisor/info/v1"
 	"github.com/google/cadvisor/zfs"
+	"github.com/opencontainers/runc/libcontainer/cgroups"
 
 	dockercontainer "github.com/docker/docker/api/types/container"
 	docker "github.com/docker/docker/client"
@@ -121,7 +122,7 @@ func newDockerContainerHandler(
 	fsInfo fs.FsInfo,
 	storageDriver storageDriver,
 	storageDir string,
-	cgroupSubsystems *containerlibcontainer.CgroupSubsystems,
+	cgroupSubsystems map[string]string,
 	inHostNamespace bool,
 	metadataEnvAllowList []string,
 	dockerVersion []int,
@@ -131,7 +132,7 @@ func newDockerContainerHandler(
 	zfsWatcher *zfs.ZfsWatcher,
 ) (container.ContainerHandler, error) {
 	// Create the cgroup paths.
-	cgroupPaths := common.MakeCgroupPaths(cgroupSubsystems.MountPoints, name)
+	cgroupPaths := common.MakeCgroupPaths(cgroupSubsystems, name)
 
 	// Generate the equivalent cgroup manager for this container.
 	cgroupManager, err := containerlibcontainer.NewCgroupManager(name, cgroupPaths)
@@ -484,7 +485,11 @@ func (h *dockerContainerHandler) ListContainers(listType container.ListType) ([]
 }
 
 func (h *dockerContainerHandler) GetCgroupPath(resource string) (string, error) {
-	path, ok := h.cgroupPaths[resource]
+	var res string
+	if !cgroups.IsCgroup2UnifiedMode() {
+		res = resource
+	}
+	path, ok := h.cgroupPaths[res]
 	if !ok {
 		return "", fmt.Errorf("could not find path for resource %q for container %q", resource, h.reference.Name)
 	}