daandemeyer / rpms / systemd

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