Merge pull request #34591 from teknoraver/timer

timer: introduce DeferReactivation setting

test/TEST-74-AUX-UTILS/TEST-74-AUX-UTILS.units/realtime-test.service

@@ -0,0 +1,6 @@
+[Unit]
+Description=Testing systemd timers
+
+[Service]
+Type=simple
+ExecStart=sh -c 'date +%%s >>/tmp/realtime-test.log ; sleep 5'

test/TEST-74-AUX-UTILS/TEST-74-AUX-UTILS.units/realtime-test.timer

@@ -0,0 +1,10 @@
+[Unit]
+Description=Testing systemd timers
+
+[Timer]
+OnCalendar=*:*:0/5
+AccuracySec=1us
+DeferReactivation=true
+
+[Install]
+WantedBy=timers.target

test/TEST-74-AUX-UTILS/meson.build

@@ -7,3 +7,5 @@ integration_tests += [
                 'vm' : true,
         },
 ]
+
+testdata_subdirs += [meson.current_source_dir() / 'TEST-74-AUX-UTILS.units']

test/fuzz/fuzz-unit-file/directives-all.service

@@ -7,6 +7,7 @@ AllowedCPUs=
 AllowedMemoryNodes=
 AllowIsolate=
 Also=
+DeferReactivation=
 AmbientCapabilities=
 AssertACPower=
 AssertArchitecture=

test/fuzz/fuzz-unit-file/tmpfiles-clean.timer

@@ -33,6 +33,7 @@ Persistent=true
 AccuracySec=24h
 RandomizedDelaySec=234234234
 FixedRandomDelay=true
+DeferReactivation=true
 
 Persistent=no
 Unit=foo.service

test/units/TEST-74-AUX-UTILS.defer_reactivation.sh

@@ -0,0 +1,23 @@
+#!/usr/bin/env bash
+# SPDX-License-Identifier: LGPL-2.1-or-later
+set -eux
+set -o pipefail
+
+systemctl start realtime-test.timer
+
+sleep 35
+mindelta=10
+
+last=
+while read -r time; do
+    if [ -n "$last" ]; then
+        delta=$((time - last))
+        if [ "$delta" -lt $mindelta ]; then
+            echo "Timer fired too early: $delta < $mindelta" >/failed
+            break
+        fi
+    fi
+    last=$time
+done </tmp/realtime-test.log
+
+test ! -s /failed