Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

stats: cap memory limit to the available memory #15811

Merged
merged 2 commits into from
Sep 15, 2022
+52 −2
Merged

stats: cap memory limit to the available memory #15811

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cf2118e
stats: map MaxUsage to the correct value
giuseppe Sep 14, 2022
60ef4ad
stats: cap memory limit to the available memory
giuseppe Sep 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion pkg/api/handlers/compat/containers_stats.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import (
"github.com/containers/podman/v4/libpod/define"
"github.com/containers/podman/v4/pkg/api/handlers/utils"
api "github.com/containers/podman/v4/pkg/api/types"
"github.com/containers/storage/pkg/system"
docker "github.com/docker/docker/api/types"
"github.com/gorilla/schema"
runccgroups "github.com/opencontainers/runc/libcontainer/cgroups"
Expand Down Expand Up @@ -139,6 +140,16 @@ streamLabel: // A label to flatten the scope
memoryLimit = uint64(*cfg.Spec.Linux.Resources.Memory.Limit)
}

memInfo, err := system.ReadMemInfo()
if err != nil {
logrus.Errorf("Unable to get cgroup stats: %v", err)
return
}
// cap the memory limit to the available memory.
if memInfo.MemTotal > 0 && memoryLimit > uint64(memInfo.MemTotal) {
memoryLimit = uint64(memInfo.MemTotal)
}

systemUsage, _ := cgroups.GetSystemCPUUsage()
s := StatsJSON{
Stats: Stats{
Expand Down Expand Up @@ -177,7 +188,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,
Expand Down
17 changes: 17 additions & 0 deletions test/apiv2/20-containers.at
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -111,6 +117,17 @@ if root; then
podman rm -f $CTRNAME
fi

# Issue #15765: make sure the memory limit is capped
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!=18446744073709552000

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\\}
Expand Down
24 changes: 23 additions & 1 deletion test/apiv2/test-apiv2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,22 @@ function is() {
_show_ok 0 "$testname" "$expect" "$actual"
}

############
# is_not # Simple disequality
############
function is_not() {
local actual=$1
local expect_not=$2
local testname=$3

if [ "$actual" != "$expect_not" ]; then
# On success, include expected value; this helps readers understand
_show_ok 1 "$testname!=$expect"
return
fi
_show_ok 0 "$testname" "!= $expect" "$actual"
}

##########
# like # Compare, but allowing patterns
##########
Expand Down Expand Up @@ -377,7 +393,13 @@ function t() {
fi

for i; do
if expr "$i" : "[^=~]\+=.*" >/dev/null; then
if expr "$i" : '[^\!]\+\!=.\+' >/dev/null; then
# Disequality on json field
json_field=$(expr "$i" : '\([^!]*\)!')
expect_not=$(expr "$i" : '[^\!]*\!=\(.*\)')
actual=$(jq -r "$json_field" <<<"$output")
is_not "$actual" "$expect_not" "$testname : $json_field"
elif expr "$i" : "[^=~]\+=.*" >/dev/null; then
# Exact match on json field
json_field=$(expr "$i" : "\([^=]*\)=")
expect=$(expr "$i" : '[^=]*=\(.*\)')
Expand Down