cgroup: upgrade to containerd/cgroup/v3

go.mod

@@ -10,7 +10,7 @@ require (
 	github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be
 	github.com/boltdb/bolt v1.3.1
 	github.com/codeskyblue/go-sh v0.0.0-20200712050446-30169cf553fe
-	github.com/containerd/cgroups v1.1.0
+	github.com/containerd/cgroups/v3 v3.0.5
 	github.com/dennwc/btrfs v0.0.0-20241002142654-12ae127e0bf6
 	github.com/dgraph-io/badger/v2 v2.2007.4
 	github.com/docker/go-units v0.5.0
@@ -49,6 +49,7 @@ require (
 	github.com/cloudwego/base64x v0.1.4 // indirect
 	github.com/cloudwego/iasm v0.2.0 // indirect
 	github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0 // indirect
+	github.com/containerd/log v0.1.0 // indirect
 	github.com/coreos/etcd v3.3.10+incompatible // indirect
 	github.com/coreos/go-etcd v2.0.0+incompatible // indirect
 	github.com/coreos/go-semver v0.2.0 // indirect
@@ -109,6 +110,7 @@ require (
 	github.com/mdlayher/socket v0.4.1 // indirect
 	github.com/mitchellh/go-homedir v1.1.0 // indirect
 	github.com/mitchellh/mapstructure v1.1.2 // indirect
+	github.com/moby/sys/userns v0.1.0 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/nxadm/tail v1.4.8 // indirect

go.sum

@@ -67,6 +67,10 @@ github.com/containerd/cgroups v1.0.2-0.20210729163027-ddda8a174e9a h1:Se756mbFRj
 github.com/containerd/cgroups v1.0.2-0.20210729163027-ddda8a174e9a/go.mod h1:M9MzGh4G4yzSq0e3Bf6tQCoDsvGewJdfhIix9CRaOWo=
 github.com/containerd/cgroups v1.1.0 h1:v8rEWFl6EoqHB+swVNjVoCJE8o3jX7e8nqBGPLaDFBM=
 github.com/containerd/cgroups v1.1.0/go.mod h1:6ppBcbh/NOOUU+dMKrykgaBnK9lCIBxHqJDGwsa1mIw=
+github.com/containerd/cgroups/v3 v3.0.5 h1:44na7Ud+VwyE7LIoJ8JTNQOa549a8543BmzaJHo6Bzo=
+github.com/containerd/cgroups/v3 v3.0.5/go.mod h1:SA5DLYnXO8pTGYiAHXz94qvLQTKfVM5GEVisn4jpins=
+github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I=
+github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3EhrzVo=
 github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
 github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk=
 github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
@@ -266,6 +270,8 @@ github.com/moby/moby v24.0.9+incompatible h1:Z/hFbZJqC5Fmuf6jesMLdHU71CMAgdiSJ1Z
 github.com/moby/moby v24.0.9+incompatible/go.mod h1:fDXVQ6+S340veQPv35CzDahGBmHsiclFwfEygB/TWMc=
 github.com/moby/moby v27.4.1+incompatible h1:z6detzbcLRt7U+w4ovHV+8oYpJfpHKTmUbFWPG6cudA=
 github.com/moby/moby v27.4.1+incompatible/go.mod h1:fDXVQ6+S340veQPv35CzDahGBmHsiclFwfEygB/TWMc=
+github.com/moby/sys/userns v0.1.0 h1:tVLXkFOxVu9A64/yh59slHVv9ahO9UIev4JZusOLG/g=
+github.com/moby/sys/userns v0.1.0/go.mod h1:IHUYgu/kao6N8YZlp9Cf444ySSvCmDlmzUcYfDHOl28=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=

worker/cgroup.go

@@ -12,8 +12,9 @@ import (
 
 	"golang.org/x/sys/unix"
 
-	cgv1 "github.com/containerd/cgroups"
-	cgv2 "github.com/containerd/cgroups/v2"
+	cgroups "github.com/containerd/cgroups/v3"
+	cgv1 "github.com/containerd/cgroups/v3/cgroup1"
+	cgv2 "github.com/containerd/cgroups/v3/cgroup2"
 	"github.com/moby/moby/pkg/reexec"
 	contspecs "github.com/opencontainers/runtime-spec/specs-go"
 )
@@ -83,7 +84,7 @@ func initCgroup(cfg *cgroupConfig) error {
 		baseGroup = filepath.Join("/", baseGroup)
 	}
 
-	cfg.isUnified = cgv1.Mode() == cgv1.Unified
+	cfg.isUnified = cgroups.Mode() == cgroups.Unified
 
 	if cfg.isUnified {
 		logger.Debugf("Cgroup V2 detected")
@@ -98,7 +99,7 @@ func initCgroup(cfg *cgroupConfig) error {
 		logger.Infof("Using cgroup path: %s", g)
 
 		var err error
-		if cfg.cgMgrV2, err = cgv2.LoadManager("/sys/fs/cgroup", g); err != nil {
+		if cfg.cgMgrV2, err = cgv2.Load(g); err != nil {
 			return err
 		}
 		if baseGroup == "" {
@@ -167,7 +168,7 @@ func initCgroup(cfg *cgroupConfig) error {
 		}
 		logger.Infof("Loading cgroup")
 		var err error
-		if cfg.cgMgrV1, err = cgv1.Load(cgv1.V1, pather, func(cfg *cgv1.InitConfig) error {
+		if cfg.cgMgrV1, err = cgv1.Load(pather, func(cfg *cgv1.InitConfig) error {
 			cfg.InitCheck = cgv1.AllowAny
 			return nil
 		}); err != nil {

worker/cgroup_test.go

@@ -11,8 +11,8 @@ import (
 	"testing"
 	"time"
 
-	cgv1 "github.com/containerd/cgroups"
-	cgv2 "github.com/containerd/cgroups/v2"
+	cgv1 "github.com/containerd/cgroups/v3/cgroup1"
+	cgv2 "github.com/containerd/cgroups/v3/cgroup2"
 	units "github.com/docker/go-units"
 	"github.com/moby/moby/pkg/reexec"
 
@@ -250,7 +250,7 @@ sleep 30
 				if cgcf.Group == "" {
 					wkrg, err := cgv2.NestedGroupPath("")
 					So(err, ShouldBeNil)
-					wkrMgr, err := cgv2.LoadManager("/sys/fs/cgroup", wkrg)
+					wkrMgr, err := cgv2.Load(wkrg)
 					allCtrls, err := wkrMgr.Controllers()
 					So(err, ShouldBeNil)
 					err = wkrMgr.ToggleControllers(allCtrls, cgv2.Disable)
@@ -290,7 +290,7 @@ sleep 30
 							return path, err
 						}
 					})(cgv1.NestedPath(""))
-					wkrMgr, err := cgv1.Load(cgv1.V1, pather, func(cfg *cgv1.InitConfig) error {
+					wkrMgr, err := cgv1.Load(pather, func(cfg *cgv1.InitConfig) error {
 						cfg.InitCheck = cgv1.AllowAny
 						return nil
 					})

worker/config.go

@@ -6,8 +6,8 @@ import (
 	"path/filepath"
 
 	"github.com/BurntSushi/toml"
-	cgv1 "github.com/containerd/cgroups"
-	cgv2 "github.com/containerd/cgroups/v2"
+	cgv1 "github.com/containerd/cgroups/v3/cgroup1"
+	cgv2 "github.com/containerd/cgroups/v3/cgroup2"
 	units "github.com/docker/go-units"
 	"github.com/imdario/mergo"
 )

worker/runner.go

@@ -11,7 +11,7 @@ import (
 	"time"
 
 	"github.com/codeskyblue/go-sh"
-	cgv1 "github.com/containerd/cgroups"
+	cgv1 "github.com/containerd/cgroups/v3/cgroup1"
 	"github.com/moby/moby/pkg/reexec"
 	"golang.org/x/sys/unix"
 )