containers
/
automation-tests
mirror of https://github.com/containers/automation-tests.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4141 from giuseppe/add-cgroups-info 

info: add cgroups2
This commit is contained in:
OpenShift Merge Robot 2019-09-30 14:38:23 -07:00 committed by GitHub
parent b063383390 b40e44ac1a
commit 5702dd7005
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libpod/info.go
View File

@ -13,6 +13,7 @@ import (
"time" "time"
"github.com/containers/buildah" "github.com/containers/buildah"
"github.com/containers/libpod/pkg/cgroups"
"github.com/containers/libpod/pkg/rootless" "github.com/containers/libpod/pkg/rootless"
"github.com/containers/libpod/utils" "github.com/containers/libpod/utils"
"github.com/containers/storage" "github.com/containers/storage"
@ -29,6 +30,15 @@ func (r *Runtime) hostInfo() (map[string]interface{}, error) {
info["arch"] = runtime.GOARCH info["arch"] = runtime.GOARCH
info["cpus"] = runtime.NumCPU() info["cpus"] = runtime.NumCPU()
info["rootless"] = rootless.IsRootless() info["rootless"] = rootless.IsRootless()
unified, err := cgroups.IsCgroup2UnifiedMode()
if err != nil {
return nil, errors.Wrapf(err, "error reading cgroups mode")
}
cgroupVersion := "v1"
if unified {
cgroupVersion = "v2"
}
info["CgroupVersion"] = cgroupVersion
mi, err := system.ReadMemInfo() mi, err := system.ReadMemInfo()
if err != nil { if err != nil {
return nil, errors.Wrapf(err, "error reading memory info") return nil, errors.Wrapf(err, "error reading memory info")