Promtail: handling tight loop in journal follow logic #4066
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Danny Kopping <danny.kopping@grafana.com>
dannykopping
force-pushed
the
dannykopping/fix-journal-tight-loop
branch
from
6fa92dd
to
ce36054
Compare
added 3 commits
July 28, 2021 15:21
Signed-off-by: Danny Kopping <danny.kopping@grafana.com>
…journal-tight-loop
…journal-tight-loop
5 tasks
dannykopping
pushed a commit
that referenced
this pull request
Apr 3, 2023
**What this PR does / why we need it**: Since PR #4066 two messages are logged for the errors `ErrExpired` and `EOF`, whereas nothing has been logged beforehand. As `ErrExpired` is returned by the `JournalReader` after sending a message to the `until` channel to signal a normal stop, this should not be logged as an error.
grafanabot
pushed a commit
that referenced
this pull request
May 5, 2023
**What this PR does / why we need it**: Since PR #4066 two messages are logged for the errors `ErrExpired` and `EOF`, whereas nothing has been logged beforehand. As `ErrExpired` is returned by the `JournalReader` after sending a message to the `until` channel to signal a normal stop, this should not be logged as an error. (cherry picked from commit 46af2cd)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What this PR does / why we need it:
While following the systemd journal, if an
EBADMSGerror is thrown (or indeed anything else besides forsdjournal.ErrExpiredorio.EOF), then we will enter into a tight loop and consume all available CPU.This PR handles
EBADMSGwhich can occur in a corrupt journal file, and additionally adds a 100ms sleep in the loop to prevent runaway CPU usage.Which issue(s) this PR fixes:
Partially addresses #4053
Special notes for your reviewer:
Checklist