mirror of
https://github.com/systemd/systemd-stable.git
synced 2025-02-01 05:47:04 +03:00
TEST-55-OOMD: improve ephemeral configuration readability
(cherry picked from commit 6acbb3f2fb234d9903c15571472d95afee9d08c1) (cherry picked from commit 3cbc30f3096aa880d57fd7f7a8960fa7f7958085) (cherry picked from commit d0bdac53cb370f5d64cd271ee29314fc6b3d0ca6)
This commit is contained in:
parent
1326a91215
commit
0478336785
@ -27,14 +27,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 <<EOF
|
||||
[OOM]
|
||||
DefaultMemoryPressureDurationSec=2s
|
||||
EOF
|
||||
|
||||
mkdir -p /run/systemd/system/-.slice.d/
|
||||
echo -e "[Slice]\nManagedOOMSwap=auto" >/run/systemd/system/-.slice.d/99-oomd-test.conf
|
||||
cat >/run/systemd/system/-.slice.d/99-oomd-test.conf <<EOF
|
||||
[Slice]
|
||||
ManagedOOMSwap=auto
|
||||
EOF
|
||||
|
||||
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
|
||||
cat >/run/systemd/system/user@.service.d/99-oomd-test.conf <<EOF
|
||||
[Service]
|
||||
ManagedOOMMemoryPressure=auto
|
||||
ManagedOOMMemoryPressureLimit=0%
|
||||
EOF
|
||||
|
||||
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
|
||||
cat >/run/systemd/system/systemd-oomd.service.d/debug.conf <<EOF
|
||||
[Service]
|
||||
Environment=SYSTEMD_LOG_LEVEL=debug
|
||||
EOF
|
||||
|
||||
systemctl daemon-reload
|
||||
|
||||
@ -124,8 +139,10 @@ 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 /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
|
||||
cat >/run/systemd/system/testsuite-55-testbloat.service.d/override.conf <<EOF
|
||||
[Service]
|
||||
ManagedOOMPreference=avoid
|
||||
EOF
|
||||
|
||||
systemctl daemon-reload
|
||||
systemctl start testsuite-55-testchill.service
|
||||
|
Loading…
x
Reference in New Issue
Block a user