summaryrefslogtreecommitdiff
path: root/test/apiv2
diff options
context:
space:
mode:
authorGiuseppe Scrivano <gscrivan@redhat.com>2022-06-21 12:06:24 +0200
committerGiuseppe Scrivano <gscrivan@redhat.com>2022-06-21 12:06:33 +0200
commit1f539a26417bf5e76604361c1ea2841941809359 (patch)
tree58eb3ccdc4d4b87bd6f97a654eb521e336a38140 /test/apiv2
parentfe8e536328eef61f0cf7ffd42b74d4e5be4654ee (diff)
downloadpodman-1f539a26417bf5e76604361c1ea2841941809359.tar.gz
podman-1f539a26417bf5e76604361c1ea2841941809359.tar.bz2
podman-1f539a26417bf5e76604361c1ea2841941809359.zip
api: show the memory limit specified for the container
use the memory limit specified for the container instead of reading it from the cgroup. It is not reliable to read it from the cgroup since the container could have been moved to a different cgroup and in general the OCI runtime might create a sub-cgroup (like crun does). Closes: https://github.com/containers/podman/issues/14676 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
Diffstat (limited to 'test/apiv2')
-rw-r--r--test/apiv2/20-containers.at11
1 files changed, 11 insertions, 0 deletions
diff --git a/test/apiv2/20-containers.at b/test/apiv2/20-containers.at
index 383c527b4..2f48e188e 100644
--- a/test/apiv2/20-containers.at
+++ b/test/apiv2/20-containers.at
@@ -95,6 +95,17 @@ fi
t DELETE libpod/containers/$cid 200 .[0].Id=$cid
+# Issue #14676: make sure the stats show the memory limit specified for the container
+if root; then
+ CTRNAME=ctr-with-limit
+ podman run --name $CTRNAME -d -m 512m -v /tmp:/tmp $IMAGE top
+
+ t GET libpod/containers/$CTRNAME/stats?stream=false 200 \
+ .memory_stats.limit=536870912
+
+ podman rm -f $CTRNAME
+fi
+
# Issue #6799: it should be possible to start a container, even w/o args.
t POST libpod/containers/create?name=test_noargs Image=${IMAGE} 201 \
.Id~[0-9a-f]\\{64\\}