From: Klearchos Chaloulos <klearchos.chaloulos@nokia.com>
Date: Tue, 9 Feb 2016 10:14:54 +0000 (+0200)
Subject: journal: Drop monotonicity check when appending to journal file
X-Git-Tag: v229~22^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ecb6105a1bd8445a123343827d46bb527bcca92f;p=thirdparty%2Fsystemd.git

journal: Drop monotonicity check when appending to journal file

Remove the check that triggers rotation of the journal file when the arriving log entry had a monotonic timestamp smaller that the previous log entry. This check causes unnecessary rotations when journal-remote was receiving from multiple senders, therefore monotonicity can not be guaranteed. Also, it does not offer any useful functionality for systemd-journald.
---

diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c
index 3d87e25724b..3fcec88e945 100644
--- a/src/journal/journal-file.c
+++ b/src/journal/journal-file.c
@@ -1533,10 +1533,6 @@ int journal_file_append_entry(JournalFile *f, const dual_timestamp *ts, const st
                 ts = &_ts;
         }
 
-        if (f->tail_entry_monotonic_valid &&
-            ts->monotonic < le64toh(f->header->tail_entry_monotonic))
-                return -EINVAL;
-
 #ifdef HAVE_GCRYPT
         r = journal_file_maybe_append_tag(f, ts->realtime);
         if (r < 0)