shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-03-23 10:50:16 +03:00
Code

journal-upload : Ignore journal event when already in uploading state.

Browse Source 
When the log rate is high, it is possible that the callback dispatch_journal_input() will be called twice, while the program is in uploading state. There is a guard for this in dispatch_journal_input(). However it is not enough, as it is possible that the uploading state is not set when the code is in dispatch_journal_input().
The result of the above is that a log would be skipped, as sd_journal_next_skip() would be called twice.
Adding a new check in process_journal_input(), just before the code to sd_journal_next_skip(),  makes sure that the code ignores a duplicate callback, when the first callback is in uploading state.
Also, removed the warning log from dispatch_journal_input(), as this occurence is normal.
This commit is contained in:
Klearchos Chaloulos 2015-12-09 18:34:36 +02:00
parent 0896271419
commit 8a3db16df4
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/journal-remote/journal-upload-journal.c
View File

@ -312,6 +312,9 @@ void close_journal_input(Uploader *u) {
static int process_journal_input(Uploader *u, int skip) {
int r;
if (u->uploading)
return 0;
r = sd_journal_next_skip(u->journal, skip);
if (r < 0)
return log_error_errno(r, "Failed to skip to next entry: %m");
@ -349,10 +352,8 @@ static int dispatch_journal_input(sd_event_source *event,
assert(u);
if (u->uploading) {
log_warning("dispatch_journal_input called when uploading, ignoring.");
if (u->uploading)
return 0;
}
log_debug("Detected journal input, checking for new data.");
return check_journal_input(u);