picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

journal: skipping of exhausted journal files is bad if direction changed

Browse source 
EOF is meaningless if the direction of iteration changes.
Move the EOF optimization under the direction check.

This fixes test-journal-interleaving for me.

Thanks to Filipe Brandenburger for telling me about the failure.
This commit is contained in:
Michal Schmidt 2014-12-19 17:11:22 +01:00
parent b29ddfcb38
commit 668c965af4
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/journal/sd-journal.c
View file

@ -723,13 +723,13 @@ static int next_beyond_location(sd_journal *j, JournalFile *f, direction_t direc
assert(j);
assert(f);
/* If we hit EOF before, recheck if any new entries arrived. */
n_entries = le64toh(f->header->n_entries);
if (f->location_type == LOCATION_TAIL && n_entries == f->last_n_entries)
return 0;
f->last_n_entries = n_entries;
if (f->last_direction == direction && f->current_offset > 0) {
/* If we hit EOF before, recheck if any new entries arrived. */
n_entries = le64toh(f->header->n_entries);
if (f->location_type == LOCATION_TAIL && n_entries == f->last_n_entries)
return 0;
f->last_n_entries = n_entries;
/* LOCATION_SEEK here means we did the work in a previous
* iteration and the current location already points to a
* candidate entry. */