diff options
| author | Giuseppe Scrivano <gscrivan@redhat.com> | 2021-09-20 09:35:24 +0200 |
|---|---|---|
| committer | Giuseppe Scrivano <gscrivan@redhat.com> | 2021-09-20 16:15:23 +0200 |
| commit | 046fa274086e97ad73532c039e61fc7833ce859a (patch) | |
| tree | d2a43da7627ec5d112b12fea6e372af4469f9844 | |
| parent | 40eeb7d3ba1186056df326349be984920c55dc1b (diff) | |
| download | podman-046fa274086e97ad73532c039e61fc7833ce859a.tar.gz podman-046fa274086e97ad73532c039e61fc7833ce859a.tar.bz2 podman-046fa274086e97ad73532c039e61fc7833ce859a.zip | |
utils: raise warning only on cgroupv2
if it is not running on cgroup v2, print only a debug message since
rootless users cannot create the cgroup.
commit 9c1e27fdd536f6026efe3da4360755a3e9135ca8 introduced the regression.
[NO TESTS NEEDED]
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
(cherry picked from commit 4caca0969863f5b8d13ff377ed1cc24d4033ed1a)
| -rw-r--r-- | utils/utils.go | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/utils/utils.go b/utils/utils.go index 185ac4865..b08630d2f 100644 --- a/utils/utils.go +++ b/utils/utils.go @@ -12,6 +12,7 @@ import ( "sync" "github.com/containers/podman/v3/libpod/define" + "github.com/containers/podman/v3/pkg/cgroups" "github.com/containers/storage/pkg/archive" "github.com/pkg/errors" "github.com/sirupsen/logrus" @@ -190,7 +191,11 @@ func moveProcessToScope(pidPath, slice, scope string) error { func MovePauseProcessToScope(pausePidPath string) { err := moveProcessToScope(pausePidPath, "user.slice", "podman-pause.scope") if err != nil { - if RunsOnSystemd() { + unified, err := cgroups.IsCgroup2UnifiedMode() + if err != nil { + logrus.Warnf("Failed to detect if running with cgroup unified: %v", err) + } + if RunsOnSystemd() && unified { logrus.Warnf("Failed to add pause process to systemd sandbox cgroup: %v", err) } else { logrus.Debugf("Failed to add pause process to systemd sandbox cgroup: %v", err) |