libpod: make removePodCgroup linux specific

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>

libpod/runtime_pod_common.go

@@ -8,15 +8,10 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"path"
-	"path/filepath"
 
-	"github.com/containers/common/pkg/cgroups"
-	"github.com/containers/common/pkg/config"
 	"github.com/containers/podman/v4/libpod/define"
 	"github.com/containers/podman/v4/libpod/events"
 	"github.com/containers/podman/v4/pkg/specgen"
-	"github.com/containers/podman/v4/utils"
 	"github.com/hashicorp/go-multierror"
 	"github.com/sirupsen/logrus"
 )
@@ -199,65 +194,6 @@ func (r *Runtime) removeMalformedPod(ctx context.Context, p *Pod, ctrs []*Contai
 	return removedCtrs, nil
 }
 
-func (p *Pod) removePodCgroup() error {
-	// Remove pod cgroup, if present
-	if p.state.CgroupPath == "" {
-		return nil
-	}
-	logrus.Debugf("Removing pod cgroup %s", p.state.CgroupPath)
-
-	cgroup, err := utils.GetOwnCgroup()
-	if err != nil {
-		return err
-	}
-
-	// if we are trying to delete a cgroup that is our ancestor, we need to move the
-	// current process out of it before the cgroup is destroyed.
-	if isSubDir(cgroup, string(filepath.Separator)+p.state.CgroupPath) {
-		parent := path.Dir(p.state.CgroupPath)
-		if err := utils.MoveUnderCgroup(parent, "cleanup", nil); err != nil {
-			return err
-		}
-	}
-
-	switch p.runtime.config.Engine.CgroupManager {
-	case config.SystemdCgroupsManager:
-		if err := deleteSystemdCgroup(p.state.CgroupPath, p.ResourceLim()); err != nil {
-			return fmt.Errorf("removing pod %s cgroup: %w", p.ID(), err)
-		}
-	case config.CgroupfsCgroupsManager:
-		// Delete the cgroupfs cgroup
-		// Make sure the conmon cgroup is deleted first
-		// Since the pod is almost gone, don't bother failing
-		// hard - instead, just log errors.
-		conmonCgroupPath := filepath.Join(p.state.CgroupPath, "conmon")
-		conmonCgroup, err := cgroups.Load(conmonCgroupPath)
-		if err != nil && err != cgroups.ErrCgroupDeleted && err != cgroups.ErrCgroupV1Rootless {
-			return fmt.Errorf("retrieving pod %s conmon cgroup: %w", p.ID(), err)
-		}
-		if err == nil {
-			if err = conmonCgroup.Delete(); err != nil {
-				return fmt.Errorf("removing pod %s conmon cgroup: %w", p.ID(), err)
-			}
-		}
-		cgroup, err := cgroups.Load(p.state.CgroupPath)
-		if err != nil && err != cgroups.ErrCgroupDeleted && err != cgroups.ErrCgroupV1Rootless {
-			return fmt.Errorf("retrieving pod %s cgroup: %w", p.ID(), err)
-		}
-		if err == nil {
-			if err := cgroup.Delete(); err != nil {
-				return fmt.Errorf("removing pod %s cgroup: %w", p.ID(), err)
-			}
-		}
-	default:
-		// This should be caught much earlier, but let's still
-		// keep going so we make sure to evict the pod before
-		// ending up with an inconsistent state.
-		return fmt.Errorf("unrecognized cgroup manager %s when removing pod %s cgroups: %w", p.runtime.config.Engine.CgroupManager, p.ID(), define.ErrInternal)
-	}
-	return nil
-}
-
 func (r *Runtime) removePod(ctx context.Context, p *Pod, removeCtrs, force bool, timeout *uint) (map[string]error, error) {
 	removedCtrs := make(map[string]error)
 

libpod/runtime_pod_freebsd.go

@@ -10,3 +10,7 @@ import (
 func (r *Runtime) platformMakePod(pod *Pod, resourceLimits *spec.LinuxResources) (string, error) {
 	return "", nil
 }
+
+func (p *Pod) removePodCgroup() error {
+	return nil
+}

libpod/runtime_pod_linux.go

@@ -13,6 +13,7 @@ import (
 	"github.com/containers/common/pkg/config"
 	"github.com/containers/podman/v4/libpod/define"
 	"github.com/containers/podman/v4/pkg/rootless"
+	"github.com/containers/podman/v4/utils"
 	spec "github.com/opencontainers/runtime-spec/specs-go"
 	"github.com/sirupsen/logrus"
 )
@@ -88,3 +89,62 @@ func (r *Runtime) platformMakePod(pod *Pod, resourceLimits *spec.LinuxResources)
 
 	return cgroupParent, nil
 }
+
+func (p *Pod) removePodCgroup() error {
+	// Remove pod cgroup, if present
+	if p.state.CgroupPath == "" {
+		return nil
+	}
+	logrus.Debugf("Removing pod cgroup %s", p.state.CgroupPath)
+
+	cgroup, err := utils.GetOwnCgroup()
+	if err != nil {
+		return err
+	}
+
+	// if we are trying to delete a cgroup that is our ancestor, we need to move the
+	// current process out of it before the cgroup is destroyed.
+	if isSubDir(cgroup, string(filepath.Separator)+p.state.CgroupPath) {
+		parent := path.Dir(p.state.CgroupPath)
+		if err := utils.MoveUnderCgroup(parent, "cleanup", nil); err != nil {
+			return err
+		}
+	}
+
+	switch p.runtime.config.Engine.CgroupManager {
+	case config.SystemdCgroupsManager:
+		if err := deleteSystemdCgroup(p.state.CgroupPath, p.ResourceLim()); err != nil {
+			return fmt.Errorf("removing pod %s cgroup: %w", p.ID(), err)
+		}
+	case config.CgroupfsCgroupsManager:
+		// Delete the cgroupfs cgroup
+		// Make sure the conmon cgroup is deleted first
+		// Since the pod is almost gone, don't bother failing
+		// hard - instead, just log errors.
+		conmonCgroupPath := filepath.Join(p.state.CgroupPath, "conmon")
+		conmonCgroup, err := cgroups.Load(conmonCgroupPath)
+		if err != nil && err != cgroups.ErrCgroupDeleted && err != cgroups.ErrCgroupV1Rootless {
+			return fmt.Errorf("retrieving pod %s conmon cgroup: %w", p.ID(), err)
+		}
+		if err == nil {
+			if err = conmonCgroup.Delete(); err != nil {
+				return fmt.Errorf("removing pod %s conmon cgroup: %w", p.ID(), err)
+			}
+		}
+		cgroup, err := cgroups.Load(p.state.CgroupPath)
+		if err != nil && err != cgroups.ErrCgroupDeleted && err != cgroups.ErrCgroupV1Rootless {
+			return fmt.Errorf("retrieving pod %s cgroup: %w", p.ID(), err)
+		}
+		if err == nil {
+			if err := cgroup.Delete(); err != nil {
+				return fmt.Errorf("removing pod %s cgroup: %w", p.ID(), err)
+			}
+		}
+	default:
+		// This should be caught much earlier, but let's still
+		// keep going so we make sure to evict the pod before
+		// ending up with an inconsistent state.
+		return fmt.Errorf("unrecognized cgroup manager %s when removing pod %s cgroups: %w", p.runtime.config.Engine.CgroupManager, p.ID(), define.ErrInternal)
+	}
+	return nil
+}