diff options
| author | Matthew Heon <matthew.heon@pm.me> | 2020-09-22 11:43:02 -0400 |
|---|---|---|
| committer | Matthew Heon <mheon@redhat.com> | 2020-09-25 11:00:52 -0400 |
| commit | 29215ec523a1d7464cd39b7c68cb12d1734bcc1d (patch) | |
| tree | 38e5443dd37f58cac2febb5eb3d10a8610c347bf | |
| parent | bcd5128207fa60a24064c8f97c45fabd85fc231a (diff) | |
| download | podman-29215ec523a1d7464cd39b7c68cb12d1734bcc1d.tar.gz podman-29215ec523a1d7464cd39b7c68cb12d1734bcc1d.tar.bz2 podman-29215ec523a1d7464cd39b7c68cb12d1734bcc1d.zip | |
Include cgroup manager in `podman info` output
This is very useful for debugging cgroups v2, especially on
rootless - we need to ensure people are correctly using systemd
cgroups in these cases.
Signed-off-by: Matthew Heon <matthew.heon@pm.me>
| -rw-r--r-- | libpod/define/info.go | 1 | ||||
| -rw-r--r-- | libpod/info.go | 1 | ||||
| -rw-r--r-- | test/system/005-info.bats | 2 |
3 files changed, 4 insertions, 0 deletions
diff --git a/libpod/define/info.go b/libpod/define/info.go index 47c53d067..f0e05801c 100644 --- a/libpod/define/info.go +++ b/libpod/define/info.go @@ -15,6 +15,7 @@ type Info struct { type HostInfo struct { Arch string `json:"arch"` BuildahVersion string `json:"buildahVersion"` + CgroupManager string `json:"cgroupManager"` CGroupsVersion string `json:"cgroupVersion"` Conmon *ConmonInfo `json:"conmon"` CPUs int `json:"cpus"` diff --git a/libpod/info.go b/libpod/info.go index 153000b6f..dd7a521c1 100644 --- a/libpod/info.go +++ b/libpod/info.go @@ -87,6 +87,7 @@ func (r *Runtime) hostInfo() (*define.HostInfo, error) { info := define.HostInfo{ Arch: runtime.GOARCH, BuildahVersion: buildah.Version, + CgroupManager: r.config.Engine.CgroupManager, Linkmode: linkmode.Linkmode(), CPUs: runtime.NumCPU(), Distribution: hostDistributionInfo, diff --git a/test/system/005-info.bats b/test/system/005-info.bats index 3f1efd364..ef3e97af0 100644 --- a/test/system/005-info.bats +++ b/test/system/005-info.bats @@ -19,6 +19,8 @@ graphRoot: graphStatus: imageStore:\\\s\\\+number: 1 runRoot: +cgroupManager: +cgroupVersion: v " while read expect; do is "$output" ".*$expect" "output includes '$expect'" |