You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
75 lines
2.8 KiB
75 lines
2.8 KiB
From f813fe0bebb2dddf0fe961527c6e840b88d49dc3 Mon Sep 17 00:00:00 2001 |
|
From: =?UTF-8?q?Michal=20Sekleta=CC=81r?= <msekleta@redhat.com> |
|
Date: Tue, 4 Feb 2020 14:23:14 +0100 |
|
Subject: [PATCH] sd-journal: close journal files that were deleted by journald |
|
before we've setup inotify watch |
|
|
|
(cherry-picked from commit 28ca867abdb20d0e4ac1901e2ed669cdb41ea3f6) |
|
|
|
Fixes #14695 |
|
|
|
Related: #1820073 |
|
--- |
|
src/journal/journal-file.c | 2 +- |
|
src/journal/journal-file.h | 1 + |
|
src/journal/sd-journal.c | 15 +++++++++++++++ |
|
3 files changed, 17 insertions(+), 1 deletion(-) |
|
|
|
diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c |
|
index cf8dad3fcd..86a7e2642a 100644 |
|
--- a/src/journal/journal-file.c |
|
+++ b/src/journal/journal-file.c |
|
@@ -337,7 +337,7 @@ static int journal_file_verify_header(JournalFile *f) { |
|
return 0; |
|
} |
|
|
|
-static int journal_file_fstat(JournalFile *f) { |
|
+int journal_file_fstat(JournalFile *f) { |
|
assert(f); |
|
assert(f->fd >= 0); |
|
|
|
diff --git a/src/journal/journal-file.h b/src/journal/journal-file.h |
|
index 37749c4459..ee9772b9bb 100644 |
|
--- a/src/journal/journal-file.h |
|
+++ b/src/journal/journal-file.h |
|
@@ -139,6 +139,7 @@ int journal_file_open( |
|
|
|
int journal_file_set_offline(JournalFile *f); |
|
void journal_file_close(JournalFile *j); |
|
+int journal_file_fstat(JournalFile *j); |
|
|
|
int journal_file_open_reliably( |
|
const char *fname, |
|
diff --git a/src/journal/sd-journal.c b/src/journal/sd-journal.c |
|
index 004fe646d4..09466df810 100644 |
|
--- a/src/journal/sd-journal.c |
|
+++ b/src/journal/sd-journal.c |
|
@@ -2386,6 +2386,8 @@ _public_ int sd_journal_wait(sd_journal *j, uint64_t timeout_usec) { |
|
assert_return(!journal_pid_changed(j), -ECHILD); |
|
|
|
if (j->inotify_fd < 0) { |
|
+ Iterator i; |
|
+ JournalFile *f; |
|
|
|
/* This is the first invocation, hence create the |
|
* inotify watch */ |
|
@@ -2393,6 +2395,19 @@ _public_ int sd_journal_wait(sd_journal *j, uint64_t timeout_usec) { |
|
if (r < 0) |
|
return r; |
|
|
|
+ /* Server might have done some vacuuming while we weren't watching. |
|
+ Get rid of the deleted files now so they don't stay around indefinitely. */ |
|
+ ORDERED_HASHMAP_FOREACH(f, j->files, i) { |
|
+ r = journal_file_fstat(f); |
|
+ if (r < 0) { |
|
+ log_error("Failed to fstat() journal file '%s' : %m", f->path); |
|
+ continue; |
|
+ } |
|
+ |
|
+ if (f->last_stat.st_nlink <= 0) |
|
+ remove_file_real(j, f); |
|
+ } |
|
+ |
|
/* The journal might have changed since the context |
|
* object was created and we weren't watching before, |
|
* hence don't wait for anything, and return
|
|
|