From 9fca212c84c12b55cfc4caf94f434a808daebdb3 Mon Sep 17 00:00:00 2001 From: oxalica Date: Thu, 6 Oct 2022 09:42:33 +0800 Subject: [PATCH] nixos/tests/systemd-oomd: fix and follows upstream tests The current test triggers the kernel OOM killer and doesn't work well. --- nixos/tests/systemd-oomd.nix | 59 +++++++++++++++++++++++------------- 1 file changed, 38 insertions(+), 21 deletions(-) diff --git a/nixos/tests/systemd-oomd.nix b/nixos/tests/systemd-oomd.nix index f0b5a5f8e01a..55c4c1350000 100644 --- a/nixos/tests/systemd-oomd.nix +++ b/nixos/tests/systemd-oomd.nix @@ -3,35 +3,52 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "systemd-oomd"; + # This test is a simplified version of systemd's testsuite-55. + # https://github.com/systemd/systemd/blob/v251/test/units/testsuite-55.sh nodes.machine = { pkgs, ... }: { - systemd.oomd.extraConfig.DefaultMemoryPressureDurationSec = "1s"; # makes the test faster - # Kill cgroups when more than 1% pressure is encountered - systemd.slices."-".sliceConfig = { - ManagedOOMMemoryPressure = "kill"; - ManagedOOMMemoryPressureLimit = "1%"; - }; - # A service to bring the system under memory pressure - systemd.services.testservice = { - serviceConfig.ExecStart = "${pkgs.coreutils}/bin/tail /dev/zero"; - }; - # Do not kill the backdoor - systemd.services.backdoor.serviceConfig.ManagedOOMMemoryPressure = "auto"; - + # Limit VM resource usage. virtualisation.memorySize = 1024; + systemd.oomd.extraConfig.DefaultMemoryPressureDurationSec = "1s"; + + systemd.slices.workload = { + description = "Test slice for memory pressure kills"; + sliceConfig = { + MemoryAccounting = true; + ManagedOOMMemoryPressure = "kill"; + ManagedOOMMemoryPressureLimit = "10%"; + }; + }; + + systemd.services.testbloat = { + description = "Create a lot of memory pressure"; + serviceConfig = { + Slice = "workload.slice"; + MemoryHigh = "5M"; + ExecStart = "${pkgs.coreutils}/bin/tail /dev/zero"; + }; + }; + + systemd.services.testchill = { + description = "No memory pressure"; + serviceConfig = { + Slice = "workload.slice"; + MemoryHigh = "3M"; + ExecStart = "${pkgs.coreutils}/bin/sleep infinity"; + }; + }; }; testScript = '' - # Start the system + # Start the system. machine.wait_for_unit("multi-user.target") machine.succeed("oomctl") - # Bring the system into memory pressure - machine.succeed("echo 0 > /proc/sys/vm/panic_on_oom") # NixOS tests kill the VM when the OOM killer is invoked - override this - machine.succeed("systemctl start testservice") + machine.succeed("systemctl start testchill.service") + with subtest("OOMd should kill the bad service"): + machine.fail("systemctl start --wait testbloat.service") + assert machine.get_unit_info("testbloat.service")["Result"] == "oom-kill" - # Wait for oomd to kill something - # Matches these lines: - # systemd-oomd[508]: Killed /system.slice/systemd-udevd.service due to memory pressure for / being 3.26% > 1.00% for > 1s with reclaim activity - machine.wait_until_succeeds("journalctl -b | grep -q 'due to memory pressure for'") + with subtest("Service without memory pressure should be untouched"): + machine.require_unit_state("testchill.service", "active") ''; })