Skip to content

journald-source: add read_old_on_error() option to control where to continue after a position restore attempt failure #1113

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MrAnno wants to merge 1 commit into
base: main
Choose a base branch
from
+17 −3
Open

journald-source: add read_old_on_error() option to control where to continue after a position restore attempt failure #1113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions modules/systemd-journal/journal-reader.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -411,7 +411,7 @@ _skip_old_records(JournalReader *self)
int rc = sd_journal_next(self->journal);
if (rc < 0)
{
msg_error("systemd-journal: Error processing read-old-records(no), sd_journal_next() failed after sd_journal_seek_tail()",
msg_error("systemd-journal: Error skipping old records, sd_journal_next() failed after sd_journal_seek_tail()",
evt_tag_errno("error", -rc));
return FALSE;
}
Expand Down Expand Up @@ -478,10 +478,12 @@ _seek_to_saved_state(JournalReader *self)
{
persist_state_unmap_entry(self->persist_state, self->persist_handle);

return _seek_to_head(self);
msg_error("systemd-journal: Failed to seek the journal to the last saved cursor position.",
evt_tag_str("cursor", state->cursor));
return self->options->read_old_records_on_error ? _seek_to_head(self) : _skip_old_records(self);
}

msg_debug("systemd-journal: Seeking the journal to the last cursor position",
msg_debug("systemd-journal: Seeking the journal to the last saved cursor position",
evt_tag_str("cursor", state->cursor));

persist_state_unmap_entry(self->persist_state, self->persist_handle);
Expand Down Expand Up @@ -1021,6 +1023,12 @@ journal_reader_options_set_match_boot(JournalReaderOptions *self, gboolean enabl
self->match_boot = enable;
}

void
journal_reader_options_set_read_old_records_on_error(JournalReaderOptions *self, gboolean enable)
{
self->read_old_records_on_error = enable;
}

void
journal_reader_options_defaults(JournalReaderOptions *options)
{
Expand All @@ -1032,6 +1040,7 @@ journal_reader_options_defaults(JournalReaderOptions *options)
options->max_field_size = DEFAULT_FIELD_SIZE;
options->match_boot = FALSE;
options->super.read_old_records = TRUE;
options->read_old_records_on_error = options->super.read_old_records;
}

void
Expand Down
2 changes: 2 additions & 0 deletions modules/systemd-journal/journal-reader.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ typedef struct _JournalReaderOptions
gchar *namespace;
GList *matches;
gboolean match_boot;
gboolean read_old_records_on_error;
} JournalReaderOptions;

JournalReader *journal_reader_new(GlobalConfig *cfg);
Expand All @@ -61,6 +62,7 @@ void journal_reader_options_set_namespace(JournalReaderOptions *self, gchar *nam
void journal_reader_options_set_log_fetch_limit(JournalReaderOptions *self, gint log_fetch_limit);
void journal_reader_options_set_matches(JournalReaderOptions *self, GList *matches);
void journal_reader_options_set_match_boot(JournalReaderOptions *self, gboolean enable);
void journal_reader_options_set_read_old_records_on_error(JournalReaderOptions *self, gboolean enable);
void journal_reader_options_defaults(JournalReaderOptions *options);
void journal_reader_options_destroy(JournalReaderOptions *options);

Expand Down
2 changes: 2 additions & 0 deletions modules/systemd-journal/systemd-journal-grammar.ym
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ JournalReaderOptions *last_journal_reader_options;
%token KW_NAMESPACE
%token KW_MATCHES
%token KW_MATCH_BOOT
%token KW_READ_OLD_RECORDS_ON_ERROR

%type <ptr> source_systemd_journal
%type <ptr> source_systemd_journal_params
Expand Down Expand Up @@ -131,6 +132,7 @@ source_systemd_journal_option
{
journal_reader_options_set_match_boot(last_journal_reader_options, $3);
}
| KW_READ_OLD_RECORDS_ON_ERROR '(' yesno ')' { journal_reader_options_set_read_old_records_on_error(last_journal_reader_options, $3); }
| source_option
| source_driver_option
;
Expand Down
1 change: 1 addition & 0 deletions modules/systemd-journal/systemd-journal-parser.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ static CfgLexerKeyword systemd_journal_keywords[] =
{ "namespace", KW_NAMESPACE },
{ "matches", KW_MATCHES },
{ "match_boot", KW_MATCH_BOOT },
{ "read_old_on_error", KW_READ_OLD_RECORDS_ON_ERROR },
{ NULL }
};

Expand Down
Loading