diff options
| author | Giuseppe Scrivano <gscrivan@redhat.com> | 2022-09-14 23:18:54 +0200 |
|---|---|---|
| committer | Giuseppe Scrivano <gscrivan@redhat.com> | 2022-09-15 00:51:56 +0200 |
| commit | cf2118eab3b736feb8018bcc9f4cdb548b7ab70a (patch) | |
| tree | 460fbe6218c6d39e1cf39e1b323b4d685a4509ae | |
| parent | a73b150e70804907bb2c10390da766a0c6bc7485 (diff) | |
| download | podman-cf2118eab3b736feb8018bcc9f4cdb548b7ab70a.tar.gz podman-cf2118eab3b736feb8018bcc9f4cdb548b7ab70a.tar.bz2 podman-cf2118eab3b736feb8018bcc9f4cdb548b7ab70a.zip | |
stats: map MaxUsage to the correct value
and make sure it is not set for cgroup v2
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| -rw-r--r-- | pkg/api/handlers/compat/containers_stats.go | 2 | ||||
| -rw-r--r-- | test/apiv2/20-containers.at | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/pkg/api/handlers/compat/containers_stats.go b/pkg/api/handlers/compat/containers_stats.go index c115b4181..16311ef1e 100644 --- a/pkg/api/handlers/compat/containers_stats.go +++ b/pkg/api/handlers/compat/containers_stats.go @@ -177,7 +177,7 @@ streamLabel: // A label to flatten the scope PreCPUStats: preCPUStats, MemoryStats: docker.MemoryStats{ Usage: cgroupStat.MemoryStats.Usage.Usage, - MaxUsage: cgroupStat.MemoryStats.Usage.Limit, + MaxUsage: cgroupStat.MemoryStats.Usage.MaxUsage, Stats: nil, Failcnt: 0, Limit: memoryLimit, diff --git a/test/apiv2/20-containers.at b/test/apiv2/20-containers.at index 9ace46b8b..e581b10d1 100644 --- a/test/apiv2/20-containers.at +++ b/test/apiv2/20-containers.at @@ -98,6 +98,12 @@ else fi fi +# max_usage is not set for cgroupv2 +if have_cgroupsv2; then + t GET libpod/containers/stats?containers='[$cid]' 200 \ + .memory_stats.max_usage=null +fi + t DELETE libpod/containers/$cid 200 .[0].Id=$cid # Issue #14676: make sure the stats show the memory limit specified for the container |