From 565b13f8b2895a2656fac677fe4ed3f6344e66b2 Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Sat, 17 Jun 2023 00:01:24 +0100 Subject: [PATCH 1/2] TEST-55-OOMD: use /run/ for configuration instead of /etc/ Make sure configuration is ephemeral if the image is reused --- test/units/testsuite-55.sh | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/test/units/testsuite-55.sh b/test/units/testsuite-55.sh index 0887eac08f..4503553eac 100755 --- a/test/units/testsuite-55.sh +++ b/test/units/testsuite-55.sh @@ -22,18 +22,18 @@ if [[ -e /skipped ]]; then exit 0 fi -rm -rf /etc/systemd/system/testsuite-55-testbloat.service.d +rm -rf /run/systemd/system/testsuite-55-testbloat.service.d # Configure oomd explicitly to avoid conflicts with distro dropins -mkdir -p /etc/systemd/oomd.conf.d/ -echo -e "[OOM]\nDefaultMemoryPressureDurationSec=2s" >/etc/systemd/oomd.conf.d/99-oomd-test.conf -mkdir -p /etc/systemd/system/-.slice.d/ -echo -e "[Slice]\nManagedOOMSwap=auto" >/etc/systemd/system/-.slice.d/99-oomd-test.conf -mkdir -p /etc/systemd/system/user@.service.d/ -echo -e "[Service]\nManagedOOMMemoryPressure=auto\nManagedOOMMemoryPressureLimit=0%" >/etc/systemd/system/user@.service.d/99-oomd-test.conf +mkdir -p /run/systemd/oomd.conf.d/ +echo -e "[OOM]\nDefaultMemoryPressureDurationSec=2s" >/run/systemd/oomd.conf.d/99-oomd-test.conf +mkdir -p /run/systemd/system/-.slice.d/ +echo -e "[Slice]\nManagedOOMSwap=auto" >/run/systemd/system/-.slice.d/99-oomd-test.conf +mkdir -p /run/systemd/system/user@.service.d/ +echo -e "[Service]\nManagedOOMMemoryPressure=auto\nManagedOOMMemoryPressureLimit=0%" >/run/systemd/system/user@.service.d/99-oomd-test.conf -mkdir -p /etc/systemd/system/systemd-oomd.service.d/ -echo -e "[Service]\nEnvironment=SYSTEMD_LOG_LEVEL=debug" >/etc/systemd/system/systemd-oomd.service.d/debug.conf +mkdir -p /run/systemd/system/systemd-oomd.service.d/ +echo -e "[Service]\nEnvironment=SYSTEMD_LOG_LEVEL=debug" >/run/systemd/system/systemd-oomd.service.d/debug.conf systemctl daemon-reload @@ -122,9 +122,9 @@ if ! systemctl --machine "testuser@.host" --user status testsuite-55-testchill.s 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-55-testbloat.service.d/ - echo "[Service]" >/etc/systemd/system/testsuite-55-testbloat.service.d/override.conf - echo "ManagedOOMPreference=avoid" >>/etc/systemd/system/testsuite-55-testbloat.service.d/override.conf + mkdir -p /run/systemd/system/testsuite-55-testbloat.service.d/ + echo "[Service]" >/run/systemd/system/testsuite-55-testbloat.service.d/override.conf + echo "ManagedOOMPreference=avoid" >>/run/systemd/system/testsuite-55-testbloat.service.d/override.conf systemctl daemon-reload systemctl start testsuite-55-testchill.service From 6acbb3f2fb234d9903c15571472d95afee9d08c1 Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Sat, 17 Jun 2023 00:06:38 +0100 Subject: [PATCH 2/2] TEST-55-OOMD: improve ephemeral configuration readability --- test/units/testsuite-55.sh | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/test/units/testsuite-55.sh b/test/units/testsuite-55.sh index 4503553eac..1433e79c5b 100755 --- a/test/units/testsuite-55.sh +++ b/test/units/testsuite-55.sh @@ -26,14 +26,29 @@ rm -rf /run/systemd/system/testsuite-55-testbloat.service.d # Configure oomd explicitly to avoid conflicts with distro dropins mkdir -p /run/systemd/oomd.conf.d/ -echo -e "[OOM]\nDefaultMemoryPressureDurationSec=2s" >/run/systemd/oomd.conf.d/99-oomd-test.conf +cat >/run/systemd/oomd.conf.d/99-oomd-test.conf </run/systemd/system/-.slice.d/99-oomd-test.conf +cat >/run/systemd/system/-.slice.d/99-oomd-test.conf </run/systemd/system/user@.service.d/99-oomd-test.conf +cat >/run/systemd/system/user@.service.d/99-oomd-test.conf </run/systemd/system/systemd-oomd.service.d/debug.conf +cat >/run/systemd/system/systemd-oomd.service.d/debug.conf </run/systemd/system/testsuite-55-testbloat.service.d/override.conf - echo "ManagedOOMPreference=avoid" >>/run/systemd/system/testsuite-55-testbloat.service.d/override.conf + cat >/run/systemd/system/testsuite-55-testbloat.service.d/override.conf <