Remove Destroy method from controllerHandler

Signed-off-by: Lokesh Mandvekar <[email protected]>

Author: lsm5

common/pkg/cgroups/blkio_linux.go

@@ -29,11 +29,6 @@ func (c *linuxBlkioHandler) Apply(ctr *CgroupControl, res *cgroups.Resources) er
 	return man.Set(res)
 }
 
-// Destroy the cgroup.
-func (c *linuxBlkioHandler) Destroy(ctr *CgroupControl) error {
-	return rmDirRecursively(ctr.getCgroupv1Path(Blkio))
-}
-
 // Stat fills a metrics structure with usage stats for the controller.
 func (c *linuxBlkioHandler) Stat(ctr *CgroupControl, m *cgroups.Stats) error {
 	var ioServiceBytesRecursive []cgroups.BlkioStatEntry

common/pkg/cgroups/cgroups_linux.go

@@ -21,7 +21,6 @@ import (
 	"github.com/godbus/dbus/v5"
 	"github.com/opencontainers/cgroups"
 	"github.com/opencontainers/cgroups/fs2"
-	"github.com/sirupsen/logrus"
 	"go.podman.io/storage/pkg/fileutils"
 	"go.podman.io/storage/pkg/unshare"
 	"golang.org/x/sys/unix"
@@ -52,7 +51,6 @@ type controller struct {
 
 type controllerHandler interface {
 	Apply(*CgroupControl, *cgroups.Resources) error
-	Destroy(*CgroupControl) error
 	Stat(*CgroupControl, *cgroups.Stats) error
 }
 
@@ -150,23 +148,8 @@ func getCgroupPathForCurrentProcess() (string, error) {
 	return cgroupPath, nil
 }
 
-// getCgroupv1Path is a helper function to get the cgroup v1 path.
-func (c *CgroupControl) getCgroupv1Path(name string) string {
-	return filepath.Join(cgroupRoot, name, c.config.Path)
-}
-
 // initialize initializes the specified hierarchy.
 func (c *CgroupControl) initialize() (err error) {
-	createdSoFar := map[string]controllerHandler{}
-	defer func() {
-		if err != nil {
-			for name, ctr := range createdSoFar {
-				if err := ctr.Destroy(c); err != nil {
-					logrus.Warningf("error cleaning up controller %s for %s", name, c.config.Path)
-				}
-			}
-		}
-	}()
 	if err := createCgroupv2Path(filepath.Join(cgroupRoot, c.config.Path)); err != nil {
 		return fmt.Errorf("creating cgroup path %s: %w", c.config.Path, err)
 	}

common/pkg/cgroups/cpu_linux.go

@@ -28,11 +28,6 @@ func (c *linuxCPUHandler) Apply(ctr *CgroupControl, res *cgroups.Resources) erro
 	return man.Set(res)
 }
 
-// Destroy the cgroup.
-func (c *linuxCPUHandler) Destroy(ctr *CgroupControl) error {
-	return rmDirRecursively(ctr.getCgroupv1Path(CPU))
-}
-
 // Stat fills a metrics structure with usage stats for the controller.
 func (c *linuxCPUHandler) Stat(ctr *CgroupControl, m *cgroups.Stats) error {
 	cpu := cgroups.CpuStats{}

common/pkg/cgroups/cpuset_linux.go

@@ -33,11 +33,6 @@ func (c *linuxCpusetHandler) Create(ctr *CgroupControl) (bool, error) {
 	return true, cpusetCopyFromParent(path, true)
 }
 
-// Destroy the cgroup.
-func (c *linuxCpusetHandler) Destroy(ctr *CgroupControl) error {
-	return rmDirRecursively(ctr.getCgroupv1Path(CPUset))
-}
-
 // Stat fills a metrics structure with usage stats for the controller.
 func (c *linuxCpusetHandler) Stat(_ *CgroupControl, _ *cgroups.Stats) error {
 	return nil

common/pkg/cgroups/memory_linux.go

@@ -27,11 +27,6 @@ func (c *linuxMemHandler) Apply(ctr *CgroupControl, res *cgroups.Resources) erro
 	return man.Set(res)
 }
 
-// Destroy the cgroup.
-func (c *linuxMemHandler) Destroy(ctr *CgroupControl) error {
-	return rmDirRecursively(ctr.getCgroupv1Path(Memory))
-}
-
 // Stat fills a metrics structure with usage stats for the controller.
 func (c *linuxMemHandler) Stat(ctr *CgroupControl, m *cgroups.Stats) error {
 	var err error

common/pkg/cgroups/pids_linux.go

@@ -27,11 +27,6 @@ func (c *linuxPidHandler) Apply(ctr *CgroupControl, res *cgroups.Resources) erro
 	return man.Set(res)
 }
 
-// Destroy the cgroup.
-func (c *linuxPidHandler) Destroy(ctr *CgroupControl) error {
-	return rmDirRecursively(ctr.getCgroupv1Path(Pids))
-}
-
 // Stat fills a metrics structure with usage stats for the controller.
 func (c *linuxPidHandler) Stat(ctr *CgroupControl, m *cgroups.Stats) error {
 	if ctr.config.Path == "" {