Re: [systemd-devel] Journal tests broken by commit 6573ef05a3cbe1 ("journal: keep per-JournalFile location info during iteration")

2014-12-18 Thread Filipe Brandenburger
On Thu, Dec 18, 2014 at 4:58 PM, Filipe Brandenburger wrote: > But this does not work on trunk head, even after adapting it, the > tests start to fail in a different location, probably because of the > changes that come after it, so I think we'll need this and further > changes to it. I'll keep lo

Re: [systemd-devel] Journal tests broken by commit 6573ef05a3cbe1 ("journal: keep per-JournalFile location info during iteration")

2014-12-18 Thread Filipe Brandenburger
On Thu, Dec 18, 2014 at 4:39 PM, Filipe Brandenburger wrote: > Not sure what's the correct solution, maybe journal_file_save_location > needs to happen only in real_journal_next() outside the > ORDERED_HASHMAP_FOREACH loop? I'll try that and report if I find > something that seems to solve this pr

Re: [systemd-devel] Journal tests broken by commit 6573ef05a3cbe1 ("journal: keep per-JournalFile location info during iteration")

2014-12-18 Thread Filipe Brandenburger
I took a closer look at "test-journal-stream". It's setting up 3 journal files and writing entries to the three of them with some interleaving, then expecting to read them in order. After commit 6573ef05a3cbe1, what happens is that a single call to sd_journal_next() ends up calling next_beyond_loc

[systemd-devel] Journal tests broken by commit 6573ef05a3cbe1 ("journal: keep per-JournalFile location info during iteration")

2014-12-18 Thread Filipe Brandenburger
Hi, Commit 6573ef05a3cbe1 ("journal: keep per-JournalFile location info during iteration") breaks tests "test-journal-stream" and "test-journal-interleaving". It seems that the logic of overriding f->current_offset in journal_file_save_location has other unintended side effects, checking out that