Merging upstream version 256.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 38 insertions, 30 deletions

diff --git a/test/units/testsuite-55.sh b/test/units/TEST-55-OOMD.sh
index 81617db..b04ebca 100755
--- a/test/units/testsuite-55.sh
+++ b/test/units/TEST-55-OOMD.sh
@@ -6,6 +6,14 @@ set -o pipefail
 # shellcheck source=test/units/util.sh
  . "$(dirname "$0")"/util.sh
 
+. /etc/os-release
+# OpenSUSE does not have the stress tool packaged. It does have stress-ng but the stress-ng does not support
+# --vm-stride which this test uses.
+if [[ "$ID" =~ "opensuse" ]]; then
+    echo "Skipping due to missing stress package in OpenSUSE" >>/skipped
+    exit 77
+fi
+
 systemd-analyze log-level debug
 
 # Ensure that the init.scope.d drop-in is applied on boot
@@ -16,13 +24,14 @@ test "$(cat /sys/fs/cgroup/init.scope/memory.high)" != "max"
 [[ "$(get_cgroup_hierarchy)" == "unified" ]] || echo "no cgroupsv2" >>/skipped
 [[ -x /usr/lib/systemd/systemd-oomd ]] || echo "no oomd" >>/skipped
 if [[ -s /skipped ]]; then
-    exit 0
+    exit 77
 fi
 
-rm -rf /run/systemd/system/testsuite-55-testbloat.service.d
+rm -rf /run/systemd/system/TEST-55-OOMD-testbloat.service.d
 
 # Activate swap file if we are in a VM
 if systemd-detect-virt --vm --quiet; then
+    swapoff --all
     if [[ "$(findmnt -n -o FSTYPE /)" == btrfs ]]; then
         btrfs filesystem mkswapfile -s 64M /swapfile
     else
@@ -78,35 +87,34 @@ if [[ -v ASAN_OPTIONS || -v UBSAN_OPTIONS ]]; then
     # go on a killing spree. This fact is exacerbated further on Arch Linux which ships unstripped gcc-libs,
     # so sd-executor pulls in over 30M of libs on startup. Let's make the MemoryHigh= limit a bit more
     # generous when running with sanitizers to make the test happy.
-    mkdir -p /run/systemd/system/testsuite-55-testchill.service.d/
-    cat >/run/systemd/system/testsuite-55-testchill.service.d/99-MemoryHigh.conf <<EOF
+    systemctl edit --runtime --stdin --drop-in=99-MemoryHigh.conf TEST-55-OOMD-testchill.service <<EOF
 [Service]
 MemoryHigh=60M
 EOF
     # Do the same for the user instance as well
     mkdir -p /run/systemd/user/
-    cp -rfv /run/systemd/system/testsuite-55-testchill.service.d/ /run/systemd/user/
+    cp -rfv /run/systemd/system/TEST-55-OOMD-testchill.service.d/ /run/systemd/user/
 else
     # Ensure that we can start services even with a very low hard memory cap without oom-kills, but skip
     # under sanitizers as they balloon memory usage.
     systemd-run -t -p MemoryMax=10M -p MemorySwapMax=0 -p MemoryZSwapMax=0 /bin/true
 fi
 
-systemctl start testsuite-55-testchill.service
-systemctl start testsuite-55-testbloat.service
+systemctl start TEST-55-OOMD-testchill.service
+systemctl start TEST-55-OOMD-testbloat.service
 
 # Verify systemd-oomd is monitoring the expected units
-timeout 1m bash -xec 'until oomctl | grep "/testsuite-55-workload.slice"; do sleep 1; done'
-oomctl | grep "/testsuite-55-workload.slice"
+timeout 1m bash -xec 'until oomctl | grep "/TEST-55-OOMD-workload.slice"; do sleep 1; done'
+oomctl | grep "/TEST-55-OOMD-workload.slice"
 oomctl | grep "20.00%"
 oomctl | grep "Default Memory Pressure Duration: 2s"
 
-systemctl status testsuite-55-testchill.service
+systemctl status TEST-55-OOMD-testchill.service
 
 # systemd-oomd watches for elevated pressure for 2 seconds before acting.
 # It can take time to build up pressure so either wait 2 minutes or for the service to fail.
 for _ in {0..59}; do
-    if ! systemctl status testsuite-55-testbloat.service; then
+    if ! systemctl status TEST-55-OOMD-testbloat.service; then
         break
     fi
     oomctl
@@ -114,28 +122,28 @@ for _ in {0..59}; do
 done
 
 # testbloat should be killed and testchill should be fine
-if systemctl status testsuite-55-testbloat.service; then exit 42; fi
-if ! systemctl status testsuite-55-testchill.service; then exit 24; fi
+if systemctl status TEST-55-OOMD-testbloat.service; then exit 42; fi
+if ! systemctl status TEST-55-OOMD-testchill.service; then exit 24; fi
 
 # Make sure we also work correctly on user units.
 loginctl enable-linger testuser
 
-systemctl start --machine "testuser@.host" --user testsuite-55-testchill.service
-systemctl start --machine "testuser@.host" --user testsuite-55-testbloat.service
+systemctl start --machine "testuser@.host" --user TEST-55-OOMD-testchill.service
+systemctl start --machine "testuser@.host" --user TEST-55-OOMD-testbloat.service
 
 # Verify systemd-oomd is monitoring the expected units
 # Try to avoid racing the oomctl output check by checking in a loop with a timeout
-timeout 1m bash -xec 'until oomctl | grep "/testsuite-55-workload.slice"; do sleep 1; done'
-oomctl | grep -E "/user.slice.*/testsuite-55-workload.slice"
+timeout 1m bash -xec 'until oomctl | grep "/TEST-55-OOMD-workload.slice"; do sleep 1; done'
+oomctl | grep -E "/user.slice.*/TEST-55-OOMD-workload.slice"
 oomctl | grep "20.00%"
 oomctl | grep "Default Memory Pressure Duration: 2s"
 
-systemctl --machine "testuser@.host" --user status testsuite-55-testchill.service
+systemctl --machine "testuser@.host" --user status TEST-55-OOMD-testchill.service
 
 # systemd-oomd watches for elevated pressure for 2 seconds before acting.
 # It can take time to build up pressure so either wait 2 minutes or for the service to fail.
 for _ in {0..59}; do
-    if ! systemctl --machine "testuser@.host" --user status testsuite-55-testbloat.service; then
+    if ! systemctl --machine "testuser@.host" --user status TEST-55-OOMD-testbloat.service; then
         break
     fi
     oomctl
@@ -143,8 +151,8 @@ for _ in {0..59}; do
 done
 
 # testbloat should be killed and testchill should be fine
-if systemctl --machine "testuser@.host" --user status testsuite-55-testbloat.service; then exit 42; fi
-if ! systemctl --machine "testuser@.host" --user status testsuite-55-testchill.service; then exit 24; fi
+if systemctl --machine "testuser@.host" --user status TEST-55-OOMD-testbloat.service; then exit 42; fi
+if ! systemctl --machine "testuser@.host" --user status TEST-55-OOMD-testchill.service; then exit 24; fi
 
 loginctl disable-linger testuser
 
@@ -152,19 +160,19 @@ loginctl disable-linger testuser
 if cgroupfs_supports_user_xattrs; 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/
-    cat >/run/systemd/system/testsuite-55-testbloat.service.d/override.conf <<EOF
+    mkdir -p /run/systemd/system/TEST-55-OOMD-testbloat.service.d/
+    cat >/run/systemd/system/TEST-55-OOMD-testbloat.service.d/override.conf <<EOF
 [Service]
 ManagedOOMPreference=avoid
 EOF
 
     systemctl daemon-reload
-    systemctl start testsuite-55-testchill.service
-    systemctl start testsuite-55-testmunch.service
-    systemctl start testsuite-55-testbloat.service
+    systemctl start TEST-55-OOMD-testchill.service
+    systemctl start TEST-55-OOMD-testmunch.service
+    systemctl start TEST-55-OOMD-testbloat.service
 
     for _ in {0..59}; do
-        if ! systemctl status testsuite-55-testmunch.service; then
+        if ! systemctl status TEST-55-OOMD-testmunch.service; then
             break
         fi
         oomctl
@@ -172,9 +180,9 @@ EOF
     done
 
     # testmunch should be killed since testbloat had the avoid xattr on it
-    if ! systemctl status testsuite-55-testbloat.service; then exit 25; fi
-    if systemctl status testsuite-55-testmunch.service; then exit 43; fi
-    if ! systemctl status testsuite-55-testchill.service; then exit 24; fi
+    if ! systemctl status TEST-55-OOMD-testbloat.service; then exit 25; fi
+    if systemctl status TEST-55-OOMD-testmunch.service; then exit 43; fi
+    if ! systemctl status TEST-55-OOMD-testchill.service; then exit 24; fi
 fi
 
 systemd-analyze log-level info