]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
core: delay persistent timers by "RandomizedDelaySec=" at boot. 11608/head
authorTaro Yamada <archer_ame@yahoo.co.jp>
Tue, 19 Feb 2019 12:01:50 +0000 (21:01 +0900)
committerTaro Yamada <archer_ame@yahoo.co.jp>
Thu, 21 Feb 2019 11:33:21 +0000 (20:33 +0900)
Fixes #5659.
Currently, if Persistent=true and the machine is off at the scheduled time of the timer unit, the timer
will be triggered immediately at the next boot even if RandomizedDelaySec= is specified.

As a result, if multiple timers meet that condition, they will be triggered at the same time and too
much CPU/IO work makes boot slow down.

With this commit, if the scheduled time of the persistent timer has already elapsed at boot,
set the time when systemd first started as the scheduled time and RandomizedDelaySec= is applied to it.

src/core/timer.c

index d9ba2f76b3d3984d6745824ee74cc4abdea9185c..0c1ca3ef23369aa12312bae5ae5bb6087c639ece 100644 (file)
@@ -380,6 +380,13 @@ static void timer_enter_waiting(Timer *t, bool time_change) {
                         if (r < 0)
                                 continue;
 
+                        /* To make the delay due to RandomizedDelaySec= work even at boot,
+                         * if the scheduled time has already passed, set the time when systemd
+                         * first started as the scheduled time.
+                         * Also, we don't have to check t->persistent since the logic implicitly express true. */
+                        if (v->next_elapse < UNIT(t)->manager->timestamps[MANAGER_TIMESTAMP_USERSPACE].realtime)
+                                v->next_elapse = UNIT(t)->manager->timestamps[MANAGER_TIMESTAMP_USERSPACE].realtime;
+
                         if (!found_realtime)
                                 t->next_elapse_realtime = v->next_elapse;
                         else