summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlearchos Chaloulos <klearchos.chaloulos@nokia.com>2016-02-09 12:14:54 +0200
committerKlearchos Chaloulos <klearchos.chaloulos@nokia.com>2016-02-09 12:14:54 +0200
commitecb6105a1bd8445a123343827d46bb527bcca92f (patch)
tree309a5e775d47985c6d2226abf31bf7bc97654ea4
parent70b65964d7ef03621f5d4abd23150c1b121989b4 (diff)
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.
-rw-r--r--src/journal/journal-file.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c
index 3d87e25724..3fcec88e94 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)