mirror of
https://github.com/containers/podman.git
synced 2025-11-30 10:07:33 +08:00
libpod/runtime_ctr.go: Remove Cgroups v1
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>
This commit is contained in:
@@ -28,7 +28,6 @@ import (
|
|||||||
"github.com/opencontainers/runtime-tools/generate"
|
"github.com/opencontainers/runtime-tools/generate"
|
||||||
"github.com/sirupsen/logrus"
|
"github.com/sirupsen/logrus"
|
||||||
"go.podman.io/common/libnetwork/types"
|
"go.podman.io/common/libnetwork/types"
|
||||||
"go.podman.io/common/pkg/cgroups"
|
|
||||||
"go.podman.io/common/pkg/config"
|
"go.podman.io/common/pkg/config"
|
||||||
"go.podman.io/storage"
|
"go.podman.io/storage"
|
||||||
"go.podman.io/storage/pkg/stringid"
|
"go.podman.io/storage/pkg/stringid"
|
||||||
@@ -861,18 +860,6 @@ func (r *Runtime) removeContainer(ctx context.Context, c *Container, opts ctrRmO
|
|||||||
}
|
}
|
||||||
|
|
||||||
if c.state.State == define.ContainerStatePaused {
|
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 {
|
if err := c.ociRuntime.KillContainer(c, 9, false); err != nil {
|
||||||
retErr = err
|
retErr = err
|
||||||
return removedCtrs, removedPods, retErr
|
return removedCtrs, removedPods, retErr
|
||||||
|
|||||||
Reference in New Issue
Block a user