SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "test: pin stress-ng --vm-method to a portable scalar method in TEST-55-OOMD"

Browse Source 
This reverts commit 881e4717c7.
This commit is contained in:
Luca Boccassi
2026-05-25 11:28:37 +01:00
parent 79ddf3c6f3
commit aac19fe468
3 changed files with 5 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/integration-tests/TEST-55-OOMD/TEST-55-OOMD.units/TEST-55-OOMD-testbloat.service
+1 -4
View File
@@ -7,7 +7,4 @@ Description=Create a lot of memory pressure
# to throttle and be put under heavy pressure.
MemoryHigh=3M
Slice=TEST-55-OOMD-workload.slice
# Pin --vm-method to a portable method (zero-one): the default 'all' cycles
# through methods, including newer ones using AVX-512 instructions that SIGILL
# on CPUs without AVX-512 (e.g. AMD Zen 1-3), making the test flaky.
ExecStart=stress-ng --timeout 3m --vm 10 --vm-bytes 200M --vm-keep --vm-method=zero-one
ExecStart=stress-ng --timeout 3m --vm 10 --vm-bytes 200M --vm-keep
test/integration-tests/TEST-55-OOMD/TEST-55-OOMD.units/TEST-55-OOMD-testmunch.service
+1 -4
View File
@@ -5,7 +5,4 @@ Description=Create some memory pressure
[Service]
MemoryHigh=12M
Slice=TEST-55-OOMD-workload.slice
# Pin --vm-method to a portable method (zero-one): the default 'all' cycles
# through methods, including newer ones using AVX-512 instructions that SIGILL
# on CPUs without AVX-512 (e.g. AMD Zen 1-3), making the test flaky.
ExecStart=stress-ng --timeout 3m --vm 10 --vm-bytes 200M --vm-keep --vm-method=zero-one
ExecStart=stress-ng --timeout 3m --vm 10 --vm-bytes 200M --vm-keep
test/units/TEST-55-OOMD.sh
+3 -10
View File
@@ -365,14 +365,11 @@ EOF
systemctl reload systemd-oomd.service
# Run a transient service with OOMRules=testrule that generates memory pressure.
# Pin --vm-method to a portable method (zero-one): the default 'all' cycles
# through every method, including newer ones using AVX-512 instructions that
# SIGILL on CPUs without AVX-512 (e.g. AMD Zen 1-3), making the test flaky.
# Run a transient service with OOMRules=testrule that generates memory pressure
(! systemd-run --wait --unit=TEST-55-OOMD-testrules \
-p MemoryHigh=3M \
-p OOMRules=testrule \
stress-ng --timeout 3m --vm 10 --vm-bytes 50M --vm-keep --vm-method=zero-one)
stress-ng --timeout 3m --vm 10 --vm-bytes 50M --vm-keep)
# Verify in the journal that the rule triggered
journalctl --sync
@@ -457,14 +454,10 @@ EOF
# Start the unit without --wait so we can check mid-run state. The
# stress-ng timeout bounds the test if anything goes wrong.
# Pin --vm-method to a portable method (zero-one): the default 'all' cycles
# through every method, including newer ones using AVX-512 instructions that
# SIGILL on CPUs without AVX-512 (e.g. AMD Zen 1-3) and would cause stress-ng
# to exit before the 6 s wait below elapses, failing the ActiveState check.
systemd-run --unit=TEST-55-OOMD-slowrule \
-p MemoryHigh=3M \
-p OOMRules=slowrule \
stress-ng --timeout 15s --vm 10 --vm-bytes 50M --vm-keep --vm-method=zero-one
stress-ng --timeout 15s --vm 10 --vm-bytes 50M --vm-keep
# Wait long enough for oomd's 1s rule-check loop to evaluate the condition
# many times. With LastingSec=1h the kill must not fire.