Skip to content

Commit bce3c7e

Browse files
authored
Merge pull request #358 from thaJeztah/handle_domain_threaded
cgroup2: Manager.Delete: handle both "threaded" and "domain threaded"
2 parents d4e976d + 2236eb0 commit bce3c7e

File tree

1 file changed

+4
-8
lines changed

1 file changed

+4
-8
lines changed

cgroup2/manager.go

+4-8
Original file line numberDiff line numberDiff line change
@@ -472,10 +472,6 @@ func (c *Manager) fallbackKill() error {
472472
}
473473

474474
func (c *Manager) Delete() error {
475-
var (
476-
tasks []uint64
477-
threaded bool
478-
)
479475
// Kernel prevents cgroups with running process from being removed,
480476
// check the tree is empty.
481477
//
@@ -485,13 +481,13 @@ func (c *Manager) Delete() error {
485481
if !os.IsNotExist(err) {
486482
return err
487483
}
488-
} else {
489-
threaded = cgType == Threaded
490484
}
491485

492-
if threaded {
486+
var tasks []uint64
487+
switch cgType {
488+
case Threaded, DomainThreaded:
493489
tasks, err = c.Threads(true)
494-
} else {
490+
default:
495491
tasks, err = c.Procs(true)
496492
}
497493
if err != nil {

0 commit comments

Comments
 (0)