Add support for systemd driver

Author: aledbf

components/ws-daemon/pkg/cgroup/plugin_fuse_v2.go

@@ -14,6 +14,8 @@ import (
 	"github.com/opencontainers/runc/libcontainer/specconv"
 	"golang.org/x/sys/unix"
 	"golang.org/x/xerrors"
+
+	"github.com/gitpod-io/gitpod/common-go/log"
 )
 
 type FuseDeviceEnablerV2 struct{}
@@ -23,6 +25,8 @@ func (c *FuseDeviceEnablerV2) Type() Version { return Version2 }
 
 func (c *FuseDeviceEnablerV2) Apply(ctx context.Context, basePath, cgroupPath string) error {
 	fullCgroupPath := filepath.Join(basePath, cgroupPath)
+	log.WithField("cgroupPath", fullCgroupPath).Info("configuring devices")
+
 	cgroupFD, err := unix.Open(fullCgroupPath, unix.O_DIRECTORY|unix.O_RDONLY|unix.O_CLOEXEC, 0600)
 	if err != nil {
 		return xerrors.Errorf("cannot get directory fd for %s: %w", fullCgroupPath, err)

components/ws-daemon/pkg/container/containerd.go

@@ -7,6 +7,9 @@ package container
 import (
 	"context"
 	"encoding/json"
+	"fmt"
+	"path/filepath"
+	"regexp"
 	"strings"
 	"sync"
 	"time"
@@ -455,6 +458,8 @@ func (s *Containerd) IsContainerdReady(ctx context.Context) (bool, error) {
 	return s.Client.IsServing(ctx)
 }
 
+var kubepodsRegexp = regexp.MustCompile(`([^/]+)-([^/]+)-pod`)
+
 // ExtractCGroupPathFromContainer retrieves the CGroupPath from the linux section
 // in a container's OCI spec.
 func ExtractCGroupPathFromContainer(container containers.Container) (cgroupPath string, err error) {
@@ -466,5 +471,25 @@ func ExtractCGroupPathFromContainer(container containers.Container) (cgroupPath
 	if spec.Linux == nil {
 		return "", xerrors.Errorf("container spec has no Linux section")
 	}
+
+	// systemd: /kubepods.slice/kubepods-<QoS-class>.slice/kubepods-<QoS-class>-pod<pod-UID>.slice:<prefix>:<container-iD>
+	// cgroupfs: /kubepods/<QoS-class>/pod<pod-UID>/<container-iD>
+	fields := strings.SplitN(spec.Linux.CgroupsPath, ":", 3)
+	if len(fields) != 3 {
+		return spec.Linux.CgroupsPath, nil
+	}
+
+	if match := kubepodsRegexp.FindStringSubmatch(fields[0]); len(match) == 3 {
+		root, class := match[1], match[2]
+
+		return filepath.Join(
+			"/",
+			fmt.Sprintf("%v.slice", root),
+			fmt.Sprintf("%v-%v.slice", root, class),
+			fields[0],
+			fmt.Sprintf("%v-%v.scope", fields[1], fields[2]),
+		), nil
+	}
+
 	return spec.Linux.CgroupsPath, nil
 }

components/ws-daemon/pkg/daemon/daemon.go

@@ -65,14 +65,15 @@ func NewDaemon(config Config, reg prometheus.Registerer) (*Daemon, error) {
 
 	cgroupPlugins, err := cgroup.NewPluginHost(config.CPULimit.CGroupBasePath,
 		&cgroup.CacheReclaim{},
-		cgroupV1IOLimiter,
-		cgroupV2IOLimiter,
 		&cgroup.FuseDeviceEnablerV1{},
 		&cgroup.FuseDeviceEnablerV2{},
+		cgroupV1IOLimiter,
+		cgroupV2IOLimiter,
 	)
 	if err != nil {
 		return nil, err
 	}
+
 	err = reg.Register(cgroupPlugins)
 	if err != nil {
 		return nil, xerrors.Errorf("cannot register cgroup plugin metrics: %w", err)