opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-05-20 00:27:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #26049 from openshift-cherrypick-robot/cherry-pick-26022-to-v5.5

Browse Source 
[v5.5] test: use block devices for I/O limit tests
This commit is contained in:
openshift-merge-bot[bot]
2025-05-02 10:55:31 +00:00
committed by GitHub
parent 52eb2dcca2 27beb100dc
commit 6c18255573
11 changed files with 72 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
contrib/cirrus/setup_environment.sh
View File

@ -209,6 +209,12 @@ mount -t tmpfs -o size=75%,mode=0700 none /var/lib/containers
showrun echo "Setting CI_DESIRED_STORAGE [=$CI_DESIRED_STORAGE] for *e2e* tests" showrun echo "Setting CI_DESIRED_STORAGE [=$CI_DESIRED_STORAGE] for *e2e* tests"
echo "STORAGE_FS=$CI_DESIRED_STORAGE" >>/etc/ci_environment echo "STORAGE_FS=$CI_DESIRED_STORAGE" >>/etc/ci_environment
if ((CONTAINER==0)); then # not yet inside a container
# Load null_blk to use /dev/nullb0 for testing block
# devices limits
modprobe null_blk nr_devices=1 || :
fi
# Required to be defined by caller: The environment where primary testing happens # Required to be defined by caller: The environment where primary testing happens
# shellcheck disable=SC2154 # shellcheck disable=SC2154
showrun echo "about to set up for TEST_ENVIRON [=$TEST_ENVIRON]" showrun echo "about to set up for TEST_ENVIRON [=$TEST_ENVIRON]"

4
libpod/container_inspect.go
View File

@ -653,7 +653,7 @@ func (c *Container) GetDevices(priv bool, ctrSpec spec.Spec, deviceNodes map[str
for _, dev := range ctrSpec.Linux.Devices { for _, dev := range ctrSpec.Linux.Devices {
key := fmt.Sprintf("%d:%d", dev.Major, dev.Minor) key := fmt.Sprintf("%d:%d", dev.Major, dev.Minor)
if deviceNodes == nil { if deviceNodes == nil {
nodes, err := util.FindDeviceNodes() nodes, err := util.FindDeviceNodes(false)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -678,7 +678,7 @@ func blkioDeviceThrottle(deviceNodes map[string]string, devs []spec.LinuxThrottl
for _, dev := range devs { for _, dev := range devs {
key := fmt.Sprintf("%d:%d", dev.Major, dev.Minor) key := fmt.Sprintf("%d:%d", dev.Major, dev.Minor)
if deviceNodes == nil { if deviceNodes == nil {
nodes, err := util.FindDeviceNodes() nodes, err := util.FindDeviceNodes(true)
if err != nil { if err != nil {
return nil, err return nil, err
} }

2
libpod/container_inspect_linux.go
View File

@ -89,7 +89,7 @@ func (c *Container) platformInspectContainerHostConfig(ctrSpec *spec.Spec, hostC
continue continue
} }
if deviceNodes == nil { if deviceNodes == nil {
nodes, err := util.FindDeviceNodes() nodes, err := util.FindDeviceNodes(true)
if err != nil { if err != nil {
return err return err
} }

11
pkg/util/utils_linux.go
View File

@ -33,7 +33,8 @@ func GetContainerPidInformationDescriptors() ([]string, error) {
// [major:minor] is the device's major and minor numbers formatted as, for // [major:minor] is the device's major and minor numbers formatted as, for
// example, 2:0 and path is the path to the device node. // example, 2:0 and path is the path to the device node.
// Symlinks to nodes are ignored. // Symlinks to nodes are ignored.
func FindDeviceNodes() (map[string]string, error) { // If onlyBlockDevices is specified, character devices are ignored.
func FindDeviceNodes(onlyBlockDevices bool) (map[string]string, error) {
nodes := make(map[string]string) nodes := make(map[string]string)
err := filepath.WalkDir("/dev", func(path string, d fs.DirEntry, err error) error { err := filepath.WalkDir("/dev", func(path string, d fs.DirEntry, err error) error {
if err != nil { if err != nil {
@ -44,7 +45,13 @@ func FindDeviceNodes() (map[string]string, error) {
} }
// If we aren't a device node, do nothing. // If we aren't a device node, do nothing.
if d.Type()&(os.ModeDevice|os.ModeCharDevice) == 0 { if d.Type()&os.ModeDevice == 0 {
return nil
}
// Ignore character devices, because it is not possible to set limits on them.
// os.ModeCharDevice is usable only when os.ModeDevice is set.
if onlyBlockDevices && d.Type()&os.ModeCharDevice != 0 {
return nil return nil
} }

2
pkg/util/utils_unsupported.go
View File

@ -5,6 +5,6 @@ package util
import "errors" import "errors"
// FindDeviceNodes is not implemented anywhere except Linux. // FindDeviceNodes is not implemented anywhere except Linux.
func FindDeviceNodes() (map[string]string, error) { func FindDeviceNodes(onlyBlockDevices bool) (map[string]string, error) {
return nil, errors.New("not supported on non-Linux OSes") return nil, errors.New("not supported on non-Linux OSes")
} }

18
test/apiv2/20-containers.at
View File

@ -710,15 +710,15 @@ t GET libpod/containers/$cname/json 200 \
.ImageName=$IMAGE \ .ImageName=$IMAGE \
.Name=$cname .Name=$cname
if root; then if root && test -e /dev/nullb0; then
podman run -dt --name=updateCtr alpine podman run -dt --name=updateCtr alpine
echo '{ echo '{
"Memory":{"Limit":500000}, "Memory":{"Limit":500000},
"CPU":{"Shares":123}, "CPU":{"Shares":123},
"DeviceReadBPs": [{ "Path": "/dev/zero", "Rate": 10485760 }], "DeviceReadBPs": [{ "Path": "/dev/nullb0", "Rate": 10485760 }],
"DeviceWriteBPs": [{ "Path": "/dev/zero", "Rate": 31457280 }], "DeviceWriteBPs": [{ "Path": "/dev/nullb0", "Rate": 31457280 }],
"DeviceReadIOPs": [{ "Path": "/dev/zero", "Rate": 2000 }], "DeviceReadIOPs": [{ "Path": "/dev/nullb0", "Rate": 2000 }],
"DeviceWriteIOPs": [{ "Path": "/dev/zero", "Rate": 4000 }] "DeviceWriteIOPs": [{ "Path": "/dev/nullb0", "Rate": 4000 }]
}' >${TMPD}/update.json }' >${TMPD}/update.json
t POST libpod/containers/updateCtr/update ${TMPD}/update.json 201 t POST libpod/containers/updateCtr/update ${TMPD}/update.json 201
@ -734,25 +734,25 @@ if root; then
BlkioDeviceReadBps_expected='[ BlkioDeviceReadBps_expected='[
{ {
"Path": "/dev/zero", "Path": "/dev/nullb0",
"Rate": 10485760 "Rate": 10485760
} }
]' ]'
BlkioDeviceWriteBPs_expected='[ BlkioDeviceWriteBPs_expected='[
{ {
"Path": "/dev/zero", "Path": "/dev/nullb0",
"Rate": 31457280 "Rate": 31457280
} }
]' ]'
BlkioDeviceReadIOPs_expected='[ BlkioDeviceReadIOPs_expected='[
{ {
"Path": "/dev/zero", "Path": "/dev/nullb0",
"Rate": 2000 "Rate": 2000
} }
]' ]'
BlkioDeviceWriteIOPs_expected='[ BlkioDeviceWriteIOPs_expected='[
{ {
"Path": "/dev/zero", "Path": "/dev/nullb0",
"Rate": 4000 "Rate": 4000
} }
]' ]'

11
test/e2e/common_test.go
View File

@ -942,6 +942,13 @@ func SkipIfNotRootless(reason string) {
} }
} }
func SkipIfNotExist(reason, path string) {
checkReason(reason)
if _, err := os.Stat(path); err != nil {
Skip("[doesNotExist]: " + path + " does not exist: " + reason)
}
}
func SkipIfSystemdNotRunning(reason string) { func SkipIfSystemdNotRunning(reason string) {
checkReason(reason) checkReason(reason)
@ -1648,3 +1655,7 @@ func makeTempDirInDir(dir string) string {
Expect(err).ToNot(HaveOccurred()) Expect(err).ToNot(HaveOccurred())
return path return path
} }
func skipWithoutDevNullb0() {
SkipIfNotExist("use modprobe null_blk nr_devices=1 to create it", "/dev/nullb0")
}

22
test/e2e/run_test.go
View File

@ -848,13 +848,14 @@ USER bin`, BB)
It("podman run device-read-bps test", func() { It("podman run device-read-bps test", func() {
SkipIfRootless("Setting device-read-bps not supported for rootless users") SkipIfRootless("Setting device-read-bps not supported for rootless users")
skipWithoutDevNullb0()
var session *PodmanSessionIntegration var session *PodmanSessionIntegration
if CGROUPSV2 { if CGROUPSV2 {
session = podmanTest.Podman([]string{"run", "--rm", "--device-read-bps=/dev/zero:1mb", ALPINE, "sh", "-c", "cat /sys/fs/cgroup/$(sed -e 's|0::||' < /proc/self/cgroup)/io.max"}) session = podmanTest.Podman([]string{"run", "--rm", "--device-read-bps=/dev/nullb0:1mb", ALPINE, "sh", "-c", "cat /sys/fs/cgroup/$(sed -e 's|0::||' < /proc/self/cgroup)/io.max"})
} else { } else {
session = podmanTest.Podman([]string{"run", "--rm", "--device-read-bps=/dev/zero:1mb", ALPINE, "cat", "/sys/fs/cgroup/blkio/blkio.throttle.read_bps_device"}) session = podmanTest.Podman([]string{"run", "--rm", "--device-read-bps=/dev/nullb0:1mb", ALPINE, "cat", "/sys/fs/cgroup/blkio/blkio.throttle.read_bps_device"})
} }
session.WaitWithDefaultTimeout() session.WaitWithDefaultTimeout()
@ -866,13 +867,14 @@ USER bin`, BB)
It("podman run device-write-bps test", func() { It("podman run device-write-bps test", func() {
SkipIfRootless("Setting device-write-bps not supported for rootless users") SkipIfRootless("Setting device-write-bps not supported for rootless users")
skipWithoutDevNullb0()
var session *PodmanSessionIntegration var session *PodmanSessionIntegration
if CGROUPSV2 { if CGROUPSV2 {
session = podmanTest.Podman([]string{"run", "--rm", "--device-write-bps=/dev/zero:1mb", ALPINE, "sh", "-c", "cat /sys/fs/cgroup/$(sed -e 's|0::||' < /proc/self/cgroup)/io.max"}) session = podmanTest.Podman([]string{"run", "--rm", "--device-write-bps=/dev/nullb0:1mb", ALPINE, "sh", "-c", "cat /sys/fs/cgroup/$(sed -e 's|0::||' < /proc/self/cgroup)/io.max"})
} else { } else {
session = podmanTest.Podman([]string{"run", "--rm", "--device-write-bps=/dev/zero:1mb", ALPINE, "cat", "/sys/fs/cgroup/blkio/blkio.throttle.write_bps_device"}) session = podmanTest.Podman([]string{"run", "--rm", "--device-write-bps=/dev/nullb0:1mb", ALPINE, "cat", "/sys/fs/cgroup/blkio/blkio.throttle.write_bps_device"})
} }
session.WaitWithDefaultTimeout() session.WaitWithDefaultTimeout()
Expect(session).Should(ExitCleanly()) Expect(session).Should(ExitCleanly())
@ -883,12 +885,14 @@ USER bin`, BB)
It("podman run device-read-iops test", func() { It("podman run device-read-iops test", func() {
SkipIfRootless("Setting device-read-iops not supported for rootless users") SkipIfRootless("Setting device-read-iops not supported for rootless users")
skipWithoutDevNullb0()
var session *PodmanSessionIntegration var session *PodmanSessionIntegration
if CGROUPSV2 { if CGROUPSV2 {
session = podmanTest.Podman([]string{"run", "--rm", "--device-read-iops=/dev/zero:100", ALPINE, "sh", "-c", "cat /sys/fs/cgroup/$(sed -e 's|0::||' < /proc/self/cgroup)/io.max"}) session = podmanTest.Podman([]string{"run", "--rm", "--device-read-iops=/dev/nullb0:100", ALPINE, "sh", "-c", "cat /sys/fs/cgroup/$(sed -e 's|0::||' < /proc/self/cgroup)/io.max"})
} else { } else {
session = podmanTest.Podman([]string{"run", "--rm", "--device-read-iops=/dev/zero:100", ALPINE, "cat", "/sys/fs/cgroup/blkio/blkio.throttle.read_iops_device"}) session = podmanTest.Podman([]string{"run", "--rm", "--device-read-iops=/dev/nullb0:100", ALPINE, "cat", "/sys/fs/cgroup/blkio/blkio.throttle.read_iops_device"})
} }
session.WaitWithDefaultTimeout() session.WaitWithDefaultTimeout()
@ -900,12 +904,14 @@ USER bin`, BB)
It("podman run device-write-iops test", func() { It("podman run device-write-iops test", func() {
SkipIfRootless("Setting device-write-iops not supported for rootless users") SkipIfRootless("Setting device-write-iops not supported for rootless users")
skipWithoutDevNullb0()
var session *PodmanSessionIntegration var session *PodmanSessionIntegration
if CGROUPSV2 { if CGROUPSV2 {
session = podmanTest.Podman([]string{"run", "--rm", "--device-write-iops=/dev/zero:100", ALPINE, "sh", "-c", "cat /sys/fs/cgroup/$(sed -e 's|0::||' < /proc/self/cgroup)/io.max"}) session = podmanTest.Podman([]string{"run", "--rm", "--device-write-iops=/dev/nullb0:100", ALPINE, "sh", "-c", "cat /sys/fs/cgroup/$(sed -e 's|0::||' < /proc/self/cgroup)/io.max"})
} else { } else {
session = podmanTest.Podman([]string{"run", "--rm", "--device-write-iops=/dev/zero:100", ALPINE, "cat", "/sys/fs/cgroup/blkio/blkio.throttle.write_iops_device"}) session = podmanTest.Podman([]string{"run", "--rm", "--device-write-iops=/dev/nullb0:100", ALPINE, "cat", "/sys/fs/cgroup/blkio/blkio.throttle.write_iops_device"})
} }
session.WaitWithDefaultTimeout() session.WaitWithDefaultTimeout()

9
test/e2e/update_test.go
View File

@ -87,6 +87,7 @@ var _ = Describe("Podman update", func() {
It("podman update container all options v2", func() { It("podman update container all options v2", func() {
SkipIfCgroupV1("testing flags that only work in cgroup v2") SkipIfCgroupV1("testing flags that only work in cgroup v2")
SkipIfRootless("many of these handlers are not enabled while rootless in CI") SkipIfRootless("many of these handlers are not enabled while rootless in CI")
skipWithoutDevNullb0()
session := podmanTest.Podman([]string{"run", "-dt", ALPINE}) session := podmanTest.Podman([]string{"run", "-dt", ALPINE})
session.WaitWithDefaultTimeout() session.WaitWithDefaultTimeout()
Expect(session).Should(ExitCleanly()) Expect(session).Should(ExitCleanly())
@ -103,10 +104,10 @@ var _ = Describe("Podman update", func() {
"--memory-swap", "2G", "--memory-swap", "2G",
"--memory-reservation", "2G", "--memory-reservation", "2G",
"--blkio-weight", "123", "--blkio-weight", "123",
"--device-read-bps", "/dev/zero:10mb", "--device-read-bps", "/dev/nullb0:10mb",
"--device-write-bps", "/dev/zero:10mb", "--device-write-bps", "/dev/nullb0:10mb",
"--device-read-iops", "/dev/zero:1000", "--device-read-iops", "/dev/nullb0:1000",
"--device-write-iops", "/dev/zero:1000", "--device-write-iops", "/dev/nullb0:1000",
"--pids-limit", "123", "--pids-limit", "123",
ctrID} ctrID}

14
test/system/030-run.bats
View File

@ -1123,18 +1123,24 @@ EOF
@test "podman run --device-read-bps" { @test "podman run --device-read-bps" {
skip_if_rootless "cannot use this flag in rootless mode" skip_if_rootless "cannot use this flag in rootless mode"
if test \! -e /dev/nullb0; then
skip "/dev/nullb0 not present, use 'modprobe null_blk nr_devices=1' to create it"
fi
local cid local cid
local dev_maj_min=$(stat -c %Hr:%Lr /dev/nullb0)
# this test is a triple check on blkio flags since they seem to sneak by the tests # this test is a triple check on blkio flags since they seem to sneak by the tests
if is_cgroupsv2; then if is_cgroupsv2; then
run_podman run -dt --device-read-bps=/dev/zero:1M $IMAGE top run_podman run -dt --device-read-bps=/dev/nullb0:1M $IMAGE top
cid=$output cid=$output
run_podman exec -it $output cat /sys/fs/cgroup/io.max run_podman exec -it $output cat /sys/fs/cgroup/io.max
is "$output" ".*1:5 rbps=1048576 wbps=max riops=max wiops=max" "throttle devices passed successfully.*" is "$output" ".*$dev_maj_min rbps=1048576 wbps=max riops=max wiops=max" "throttle devices passed successfully.*"
else else
run_podman run -dt --device-read-bps=/dev/zero:1M $IMAGE top run_podman run -dt --device-read-bps=/dev/nullb0:1M $IMAGE top
cid=$output cid=$output
run_podman exec -it $output cat /sys/fs/cgroup/blkio/blkio.throttle.read_bps_device run_podman exec -it $output cat /sys/fs/cgroup/blkio/blkio.throttle.read_bps_device
is "$output" ".*1:5 1048576" "throttle devices passed successfully.*" is "$output" ".*$dev_maj_min 1048576" "throttle devices passed successfully.*"
fi fi
run_podman container rm -f -t0 $cid run_podman container rm -f -t0 $cid
} }

8
test/system/280-update.bats
View File

@ -63,10 +63,10 @@ memory-reservation = 400M | 2 | $mm.soft_limit_in_bytes = 419430400
blkio-weight = 321 | - | - | io.bfq.weight = default 321 $lomajmin 98 blkio-weight = 321 | - | - | io.bfq.weight = default 321 $lomajmin 98
blkio-weight-device = $LOOPDEVICE:98 | - | - | io.bfq.weight = default 321 $lomajmin 98 blkio-weight-device = $LOOPDEVICE:98 | - | - | io.bfq.weight = default 321 $lomajmin 98
device-read-bps = /dev/zero:10mb | - | - | io.max = $devicemax device-read-bps = $LOOPDEVICE:10mb | - | - | io.max = $devicemax
device-read-iops = /dev/zero:2000 | - | - | io.max = $devicemax device-read-iops = $LOOPDEVICE:2000 | - | - | io.max = $devicemax
device-write-bps = /dev/zero:30mb | - | - | io.max = $devicemax device-write-bps = $LOOPDEVICE:30mb | - | - | io.max = $devicemax
device-write-iops = /dev/zero:4000 | - | - | io.max = $devicemax device-write-iops = $LOOPDEVICE:4000 | - | - | io.max = $devicemax
" "
# Run a container # Run a container