From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Mon, 5 Aug 2024 05:56:11 +0000 (+0900)
Subject: journal: do not rotate journal when MaxRetentionSec= is set
X-Git-Tag: v257-rc1~737^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b63c18db03d0c120ba9eaa2aa9d0d43d80eea02b;p=thirdparty%2Fsystemd.git

journal: do not rotate journal when MaxRetentionSec= is set

The setting is about vacuuming archived journal files. It is not
necessary to rotate the current journal. Note, journal file rotation is
controlled by MaxFileSec=.

Fixes #31315.
---

diff --git a/src/journal/journald.c b/src/journal/journald.c
index 2f013c2ab2b..87ed22e7fe9 100644
--- a/src/journal/journald.c
+++ b/src/journal/journald.c
@@ -94,8 +94,7 @@ static int run(int argc, char *argv[]) {
 
                         /* The retention time is reached, so let's vacuum! */
                         if (t <= 0) {
-                                log_info("Retention time reached, rotating.");
-                                server_rotate(s);
+                                log_info("Retention time reached, vacuuming.");
                                 server_vacuum(s, /* verbose = */ false);
                                 continue;
                         }