opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-11-29 09:37:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #27271 from lsm5/podman6-no-cgv1

Browse Source 
Podman6: Remove cgroupsv1
This commit is contained in:
openshift-merge-bot[bot]
2025-11-14 17:03:59 +00:00
committed by GitHub
parent 78b3f862a4 145540fed4
commit af91cae1c5
73 changed files with 162 additions and 907 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
libpod/runtime_ctr.go
View File

@@ -28,7 +28,6 @@ import (
"github.com/opencontainers/runtime-tools/generate"
"github.com/sirupsen/logrus"
"go.podman.io/common/libnetwork/types"
"go.podman.io/common/pkg/cgroups"
"go.podman.io/common/pkg/config"
"go.podman.io/storage"
"go.podman.io/storage/pkg/stringid"
@@ -856,18 +855,6 @@ func (r *Runtime) removeContainer(ctx context.Context, c *Container, opts ctrRmO
}
if c.state.State == define.ContainerStatePaused {
isV2, err := cgroups.IsCgroup2UnifiedMode()
if err != nil {
retErr = err
return removedCtrs, removedPods, retErr
}
// cgroups v1 and v2 handle signals on paused processes differently
if !isV2 {
if err := c.unpause(); err != nil {
retErr = err
return removedCtrs, removedPods, retErr
}
}
if err := c.ociRuntime.KillContainer(c, 9, false); err != nil {
retErr = err
return removedCtrs, removedPods, retErr