github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-07-16 08:26:16 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #11324 from Champ-Goblem/runtime/fix-cgroup-deletion

Browse Source 
runtime: fix cgroupv2 deletion when sandbox_cgroup_only=false
This commit is contained in:
Fabiano Fidêncio 2025-05-30 21:23:07 +02:00 committed by GitHub
commit b8a7350a3d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/runtime/pkg/resourcecontrol/cgroups.go
View File

@ -41,10 +41,11 @@ func RenameCgroupPath(path string) (string, error) {
}
type LinuxCgroup struct {
cgroup interface{}
path string
cpusets *specs.LinuxCPU
devices []specs.LinuxDeviceCgroup
cgroup interface{}
path string
cpusets *specs.LinuxCPU
devices []specs.LinuxDeviceCgroup
sandboxCgroupOnly bool
sync.Mutex
}
@ -226,7 +227,7 @@ func NewSandboxResourceController(path string, resources *specs.LinuxResources,
}, nil
}
func LoadResourceController(path string) (ResourceController, error) {
func LoadResourceController(path string, sandboxCgroupOnly bool) (ResourceController, error) {
var err error
var cgroup interface{}
@ -242,7 +243,7 @@ func LoadResourceController(path string) (ResourceController, error) {
return nil, err
}
} else if cgroups.Mode() == cgroups.Unified {
if IsSystemdCgroup(path) {
if IsSystemdCgroup(path) && sandboxCgroupOnly {
slice, unit, err := getSliceAndUnit(path)
if err != nil {
return nil, err
@ -262,8 +263,9 @@ func LoadResourceController(path string) (ResourceController, error) {
}
return &LinuxCgroup{
path: path,
cgroup: cgroup,
sandboxCgroupOnly: sandboxCgroupOnly,
path: path,
cgroup: cgroup,
}, nil
}
@ -276,7 +278,7 @@ func (c *LinuxCgroup) Delete() error {
case cgroups.Cgroup:
return cg.Delete()
case *cgroupsv2.Manager:
if IsSystemdCgroup(c.ID()) {
if IsSystemdCgroup(c.ID()) && c.sandboxCgroupOnly {
if err := cg.DeleteSystemd(); err != nil {
return err
}

10
src/runtime/virtcontainers/sandbox.go
View File

@ -2540,14 +2540,16 @@ func (s *Sandbox) resourceControllerDelete() error {
return nil
}
sandboxController, err := resCtrl.LoadResourceController(s.state.SandboxCgroupPath)
sandboxController, err := resCtrl.LoadResourceController(s.state.SandboxCgroupPath, s.config.SandboxCgroupOnly)
if err != nil {
return err
}
resCtrlParent := sandboxController.Parent()
if err := sandboxController.MoveTo(resCtrlParent); err != nil {
return err
if resCtrlParent != "." {
if err := sandboxController.MoveTo(resCtrlParent); err != nil {
return err
}
}
if err := sandboxController.Delete(); err != nil {
@ -2555,7 +2557,7 @@ func (s *Sandbox) resourceControllerDelete() error {
}
if s.state.OverheadCgroupPath != "" {
overheadController, err := resCtrl.LoadResourceController(s.state.OverheadCgroupPath)
overheadController, err := resCtrl.LoadResourceController(s.state.OverheadCgroupPath, s.config.SandboxCgroupOnly)
if err != nil {
return err
}