From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 2 May 2023 10:23:07 +0000 (+0200)
Subject: journal: handle EADDRNOTAVAIL in two more cases gracefully
X-Git-Tag: v254-rc1~574
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5789c60973ec2aafbe30685a5c38d40b12e23107;p=thirdparty%2Fsystemd.git

journal: handle EADDRNOTAVAIL in two more cases gracefully

Follow-up for #27488.
---

diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c
index 47f1d8b5043..1763a2556ea 100644
--- a/src/journal/journald-server.c
+++ b/src/journal/journald-server.c
@@ -866,6 +866,7 @@ static bool shall_try_append_again(JournalFile *f, int r) {
         case -EBADMSG:         /* Corrupted                     */
         case -ENODATA:         /* Truncated                     */
         case -ESHUTDOWN:       /* Already archived              */
+        case -EADDRNOTAVAIL:   /* Referenced object offset out of bounds */
                 log_ratelimit_info_errno(r, JOURNAL_LOG_RATELIMIT, "%s: Journal file corrupted, rotating.", f->path);
                 return true;
 
diff --git a/src/journal/managed-journal-file.c b/src/journal/managed-journal-file.c
index 37d41f0678e..9b1fe30747e 100644
--- a/src/journal/managed-journal-file.c
+++ b/src/journal/managed-journal-file.c
@@ -537,6 +537,7 @@ int managed_journal_file_open_reliably(
                         ret);
         if (!IN_SET(r,
                     -EBADMSG,           /* Corrupted */
+                    -EADDRNOTAVAIL,     /* Referenced object offset out of bounds */
                     -ENODATA,           /* Truncated */
                     -EHOSTDOWN,         /* Other machine */
                     -EPROTONOSUPPORT,   /* Incompatible feature */