From eff79e4e22e7c745fea259c4414f685363d9f16a Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Wed, 5 Jan 2022 10:24:20 +0000 Subject: [PATCH 1/2] journal: Log a better message when we're rotating because a file is full The previous message was confusing errors. When we're rotating because we've reached the file size limit, let's log a better message. Fixes #22007. --- src/journal/journald-server.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c index a244d9c5e7..1382feada6 100644 --- a/src/journal/journald-server.c +++ b/src/journal/journald-server.c @@ -853,7 +853,10 @@ static void write_to_journal(Server *s, uid_t uid, struct iovec *iovec, size_t n return; } - log_info_errno(r, "Failed to write entry (%zu items, %zu bytes), rotating before retrying: %m", n, IOVEC_TOTAL_SIZE(iovec, n)); + if (r == -E2BIG) + log_debug("Journal file %s is full, rotating to a new file", f->file->path); + else + log_info_errno(r, "Failed to write entry (%zu items, %zu bytes), rotating before retrying: %m", n, IOVEC_TOTAL_SIZE(iovec, n)); server_rotate(s); server_vacuum(s, false); From 5b4a634a03c54a4d18b01686ac86b1133b54a939 Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Wed, 5 Jan 2022 10:46:39 +0000 Subject: [PATCH 2/2] journal: Log filename when we fail to write an entry --- src/journal/journald-server.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c index 1382feada6..9bfe22906a 100644 --- a/src/journal/journald-server.c +++ b/src/journal/journald-server.c @@ -856,7 +856,7 @@ static void write_to_journal(Server *s, uid_t uid, struct iovec *iovec, size_t n if (r == -E2BIG) log_debug("Journal file %s is full, rotating to a new file", f->file->path); else - log_info_errno(r, "Failed to write entry (%zu items, %zu bytes), rotating before retrying: %m", n, IOVEC_TOTAL_SIZE(iovec, n)); + log_info_errno(r, "Failed to write entry to %s (%zu items, %zu bytes), rotating before retrying: %m", f->file->path, n, IOVEC_TOTAL_SIZE(iovec, n)); server_rotate(s); server_vacuum(s, false); @@ -868,7 +868,7 @@ static void write_to_journal(Server *s, uid_t uid, struct iovec *iovec, size_t n log_debug("Retrying write."); r = journal_file_append_entry(f->file, &ts, NULL, iovec, n, &s->seqnum, NULL, NULL); if (r < 0) - log_error_errno(r, "Failed to write entry (%zu items, %zu bytes) despite vacuuming, ignoring: %m", n, IOVEC_TOTAL_SIZE(iovec, n)); + log_error_errno(r, "Failed to write entry to %s (%zu items, %zu bytes) despite vacuuming, ignoring: %m", f->file->path, n, IOVEC_TOTAL_SIZE(iovec, n)); else server_schedule_sync(s, priority); }