mirror of https://github.com/containers/podman.git
Merge pull request #14677 from giuseppe/memory-limit-ctr-handlers
api: show the memory limit specified for the container
This commit is contained in:
commit
79eb467325
|
@ -132,6 +132,12 @@ streamLabel: // A label to flatten the scope
|
||||||
InstanceID: "",
|
InstanceID: "",
|
||||||
}
|
}
|
||||||
|
|
||||||
|
cfg := ctnr.Config()
|
||||||
|
memoryLimit := cgroupStat.Memory.Usage.Limit
|
||||||
|
if cfg.Spec.Linux != nil && cfg.Spec.Linux.Resources != nil && cfg.Spec.Linux.Resources.Memory != nil && *cfg.Spec.Linux.Resources.Memory.Limit > 0 {
|
||||||
|
memoryLimit = uint64(*cfg.Spec.Linux.Resources.Memory.Limit)
|
||||||
|
}
|
||||||
|
|
||||||
systemUsage, _ := cgroups.GetSystemCPUUsage()
|
systemUsage, _ := cgroups.GetSystemCPUUsage()
|
||||||
s := StatsJSON{
|
s := StatsJSON{
|
||||||
Stats: Stats{
|
Stats: Stats{
|
||||||
|
@ -173,7 +179,7 @@ streamLabel: // A label to flatten the scope
|
||||||
MaxUsage: cgroupStat.Memory.Usage.Limit,
|
MaxUsage: cgroupStat.Memory.Usage.Limit,
|
||||||
Stats: nil,
|
Stats: nil,
|
||||||
Failcnt: 0,
|
Failcnt: 0,
|
||||||
Limit: cgroupStat.Memory.Usage.Limit,
|
Limit: memoryLimit,
|
||||||
Commit: 0,
|
Commit: 0,
|
||||||
CommitPeak: 0,
|
CommitPeak: 0,
|
||||||
PrivateWorkingSet: 0,
|
PrivateWorkingSet: 0,
|
||||||
|
|
|
@ -95,6 +95,17 @@ fi
|
||||||
|
|
||||||
t DELETE libpod/containers/$cid 200 .[0].Id=$cid
|
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.
|
# 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 \
|
t POST libpod/containers/create?name=test_noargs Image=${IMAGE} 201 \
|
||||||
.Id~[0-9a-f]\\{64\\}
|
.Id~[0-9a-f]\\{64\\}
|
||||||
|
|
Loading…
Reference in New Issue