daandemeyer / rpms / systemd

Forked from rpms/systemd 2 years ago
Clone
dd65c9
From 5386dfa655da623cbd5ab1be6c9c66ad866fc17a Mon Sep 17 00:00:00 2001
dd65c9
From: Lennart Poettering <lennart@poettering.net>
dd65c9
Date: Thu, 12 Nov 2015 12:33:10 +0100
dd65c9
Subject: [PATCH] journald: fix accuracy of watchdog timer event
dd65c9
dd65c9
Adding 3/4th of the watchdog frequency as accuracy on top of 1/2 of the
dd65c9
watchdog frequency means we might end up at 5/4th of the frequency which
dd65c9
means we might miss the message from time to time.
dd65c9
dd65c9
Maybe fixes #1804
dd65c9
dd65c9
(cherry picked from commit 4de2402b603ea2f518f451d06f09e15aeae54fab)
dd65c9
dd65c9
Related: #1511565
dd65c9
---
dd65c9
 src/journal/journald-server.c | 2 +-
dd65c9
 1 file changed, 1 insertion(+), 1 deletion(-)
dd65c9
dd65c9
diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c
c62b8e
index 6e7568b60b..7c69061f47 100644
dd65c9
--- a/src/journal/journald-server.c
dd65c9
+++ b/src/journal/journald-server.c
dd65c9
@@ -1716,7 +1716,7 @@ static int server_connect_notify(Server *s) {
dd65c9
         if (sd_watchdog_enabled(false, &s->watchdog_usec) > 0) {
dd65c9
                 s->send_watchdog = true;
dd65c9
 
dd65c9
-                r = sd_event_add_time(s->event, &s->watchdog_event_source, CLOCK_MONOTONIC, now(CLOCK_MONOTONIC) + s->watchdog_usec/2, s->watchdog_usec*3/4, dispatch_watchdog, s);
dd65c9
+                r = sd_event_add_time(s->event, &s->watchdog_event_source, CLOCK_MONOTONIC, now(CLOCK_MONOTONIC) + s->watchdog_usec/2, s->watchdog_usec/4, dispatch_watchdog, s);
dd65c9
                 if (r < 0)
dd65c9
                         return log_error_errno(r, "Failed to add watchdog time event: %m");
dd65c9
         }