summaryrefslogtreecommitdiff
path: root/libpod/stats.go
diff options
context:
space:
mode:
authorGiuseppe Scrivano <gscrivan@redhat.com>2019-06-19 11:13:18 +0200
committerGiuseppe Scrivano <gscrivan@redhat.com>2019-06-26 13:17:02 +0200
commit72cf0c81e86435c1c8daed9bff183b20d6bc400c (patch)
tree09ce3687ec7977ac2a027639e376db3586979bc2 /libpod/stats.go
parentfa1869381301797295dece0aec12435fc902295b (diff)
downloadpodman-72cf0c81e86435c1c8daed9bff183b20d6bc400c.tar.gz
podman-72cf0c81e86435c1c8daed9bff183b20d6bc400c.tar.bz2
podman-72cf0c81e86435c1c8daed9bff183b20d6bc400c.zip
libpod: use pkg/cgroups instead of containerd/cgroups
use the new implementation for dealing with cgroups. Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
Diffstat (limited to 'libpod/stats.go')
-rw-r--r--libpod/stats.go7
1 files changed, 3 insertions, 4 deletions
diff --git a/libpod/stats.go b/libpod/stats.go
index 926a1a511..e003f145b 100644
--- a/libpod/stats.go
+++ b/libpod/stats.go
@@ -7,8 +7,8 @@ import (
"syscall"
"time"
- "github.com/containerd/cgroups"
"github.com/containers/libpod/libpod/define"
+ "github.com/containers/libpod/pkg/cgroups"
"github.com/pkg/errors"
)
@@ -34,14 +34,13 @@ func (c *Container) GetContainerStats(previousStats *ContainerStats) (*Container
if err != nil {
return nil, err
}
- v1CGroups := GetV1CGroups(getExcludedCGroups())
- cgroup, err := cgroups.Load(v1CGroups, cgroups.StaticPath(cgroupPath))
+ cgroup, err := cgroups.Load(cgroupPath)
if err != nil {
return stats, errors.Wrapf(err, "unable to load cgroup at %s", cgroupPath)
}
// Ubuntu does not have swap memory in cgroups because swap is often not enabled.
- cgroupStats, err := cgroup.Stat(cgroups.IgnoreNotExist)
+ cgroupStats, err := cgroup.Stat()
if err != nil {
return stats, errors.Wrapf(err, "unable to obtain cgroup stats")
}