Skip to content

fix(logwatchers/journald): back off when sd_journal_wait fails #1285

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
chchen-x wants to merge 1 commit into
base: master
Choose a base branch
from
+10 −1
Open

fix(logwatchers/journald): back off when sd_journal_wait fails #1285

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
11 changes: 10 additions & 1 deletion pkg/systemlogmonitor/logwatchers/journald/log_watcher.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,16 @@ func (j *journaldWatcher) watchLoop() {
}
// If next reaches the end, wait for waitLogTimeout.
if n == 0 {
j.journal.Wait(waitLogTimeout)
// sd_journal_wait can return immediately with a negative
// errno (e.g. -ENOSPC when inotify user instances are
// exhausted, so sd_journal_get_fd cannot create the
// inotify instance it needs). Fall back to a manual sleep
// so the loop honors waitLogTimeout instead of spinning
// at 100% CPU.
if r := j.journal.Wait(waitLogTimeout); r < 0 {
klog.Errorf("sd_journal_wait failed (%d), backing off for %v", r, waitLogTimeout)
time.Sleep(waitLogTimeout)
}
continue
}

Expand Down