From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 23 Apr 2025 09:26:58 +0000 (+0200)
Subject: journald: downgrade event source priority of kmsg to same as native/syslog inputs
X-Git-Tag: v258-rc1~633^2~15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a7550558fb6dd5c89aa14fe0658b0a28fd3c556d;p=thirdparty%2Fsystemd.git

journald: downgrade event source priority of kmsg to same as native/syslog inputs

So far we schduled kmsg events at higher priority than native/syslog
ones. But that's quite problematic, since it means that kmsg events can
drown out native/syslog log events. And this actually shows up in some
CI tests.

Address that, and schedule all three sources at the same priority, so
that the earlier event always is processed first, regarding which
protocol is used.
---

diff --git a/src/journal/journald-kmsg.c b/src/journal/journald-kmsg.c
index d2942315ef5..96ee2320de2 100644
--- a/src/journal/journald-kmsg.c
+++ b/src/journal/journald-kmsg.c
@@ -410,7 +410,7 @@ int server_open_dev_kmsg(Server *s) {
         if (r < 0)
                 return log_error_errno(r, "Failed to add /dev/kmsg fd to event loop: %m");
 
-        r = sd_event_source_set_priority(es, SD_EVENT_PRIORITY_IMPORTANT+10);
+        r = sd_event_source_set_priority(es, SD_EVENT_PRIORITY_NORMAL+5);
         if (r < 0)
                 return log_error_errno(r, "Failed to adjust priority of kmsg event source: %m");