diff options
| author | Anita Zhang <the.anitazha@gmail.com> | 2021-01-28 02:31:44 -0800 |
|---|---|---|
| committer | Anita Zhang <the.anitazha@gmail.com> | 2021-02-12 12:45:36 -0800 |
| commit | 4e806bfa9fcaacb53e9bfd5c4e16b1503b12bc5e (patch) | |
| tree | 50401e8567fa785df577b57a7bf4dbd38b57093d /test | |
| parent | 59331b8e292a93bc7a03a51fe54cb65a4257e894 (diff) | |
| download | systemd-4e806bfa9fcaacb53e9bfd5c4e16b1503b12bc5e.tar.gz | |
oom: add unit file settings for oomd avoid/omit xattrs
Diffstat (limited to 'test')
| -rw-r--r-- | test/fuzz/fuzz-unit-file/directives.service | 4 | ||||
| -rwxr-xr-x | test/units/testsuite-56.sh | 8 |
2 files changed, 11 insertions, 1 deletions
diff --git a/test/fuzz/fuzz-unit-file/directives.service b/test/fuzz/fuzz-unit-file/directives.service index 15fa556dd6..0c7ded6786 100644 --- a/test/fuzz/fuzz-unit-file/directives.service +++ b/test/fuzz/fuzz-unit-file/directives.service @@ -138,6 +138,10 @@ MakeDirectory= Mark= MaxConnections= MaxConnectionsPerSource= +ManagedOOMSwap= +ManagedOOMMemoryPressure= +ManagedOOMMemoryPressureLimitPercent= +ManagedOOMPreference= MemoryAccounting= MemoryHigh= MemoryLimit= diff --git a/test/units/testsuite-56.sh b/test/units/testsuite-56.sh index 88c185b886..1884f81468 100755 --- a/test/units/testsuite-56.sh +++ b/test/units/testsuite-56.sh @@ -13,6 +13,8 @@ if [[ "$cgroup_type" != *"cgroup2"* ]] && [[ "$cgroup_type" != *"0x63677270"* ]] fi [[ -e /skipped ]] && exit 0 || true +rm -rf /etc/systemd/system/testsuite-56-testbloat.service.d + echo "DefaultMemoryPressureDurationSec=5s" >> /etc/systemd/oomd.conf systemctl start testsuite-56-testchill.service @@ -41,10 +43,14 @@ if ! systemctl status testsuite-56-testchill.service; then exit 24; fi if setfattr -n user.xattr_test -v 1 /sys/fs/cgroup/; then sleep 120 # wait for systemd-oomd kill cool down and elevated memory pressure to come down + mkdir -p /etc/systemd/system/testsuite-56-testbloat.service.d/ + echo "[Service]" > /etc/systemd/system/testsuite-56-testbloat.service.d/override.conf + echo "ManagedOOMPreference=avoid" >> /etc/systemd/system/testsuite-56-testbloat.service.d/override.conf + + systemctl daemon-reload systemctl start testsuite-56-testchill.service systemctl start testsuite-56-testmunch.service systemctl start testsuite-56-testbloat.service - setfattr -n user.oomd_avoid -v 1 /sys/fs/cgroup/testsuite.slice/testsuite-56.slice/testsuite-56-workload.slice/testsuite-56-testbloat.service timeout=$(date -ud "2 minutes" +%s) while [[ $(date -u +%s) -le $timeout ]]; do |