picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

sd-journal: close journal files that were deleted by journald before we've setup inotify watch 

Fixes #14695
This commit is contained in:
Michal Sekletár 2020-02-04 14:23:14 +01:00 committed by Zbigniew Jędrzejewski-Szmek
parent c7220ca802
commit 28ca867abd
3 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/journal/journal-file.c
View File

@ -601,7 +601,7 @@ static int journal_file_verify_header(JournalFile *f) {
return 0;
}
static int journal_file_fstat(JournalFile *f) {
int journal_file_fstat(JournalFile *f) {
int r;
assert(f);

1
src/journal/journal-file.h
View File

@ -145,6 +145,7 @@ int journal_file_open(
int journal_file_set_offline(JournalFile *f, bool wait);
bool journal_file_is_offlining(JournalFile *f);
JournalFile* journal_file_close(JournalFile *j);
int journal_file_fstat(JournalFile *f);
DEFINE_TRIVIAL_CLEANUP_FUNC(JournalFile*, journal_file_close);
int journal_file_open_reliably(

15
src/journal/sd-journal.c
View File

@ -2661,6 +2661,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 */
@ -2668,6 +2670,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_debug_errno(r,"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