Skip to content

Commit 3197d77

Browse files
yuwatabluca
authored andcommitted
journal: sync immediately on shutting down journald
Otherwise, sd_event_add_time_relative() or sd_event_source_set_time_relative() below will trigger assert_return(). Prompted by #30029.
1 parent 097445d commit 3197d77

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

src/journal/journald-server.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1877,6 +1877,12 @@ int server_schedule_sync(Server *s, int priority) {
18771877
return 0;
18781878
}
18791879

1880+
if (!s->event || sd_event_get_state(s->event) == SD_EVENT_FINISHED) {
1881+
/* Shutting down the server? Let's sync immediately. */
1882+
server_sync(s);
1883+
return 0;
1884+
}
1885+
18801886
if (s->sync_scheduled)
18811887
return 0;
18821888

0 commit comments

Comments
 (0)