Skip to content

journald: add fallback when inotify is unavailable due to system limits #252

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

Merged
def merged 1 commit into from
Oct 15, 2025
Merged

journald: add fallback when inotify is unavailable due to system limits #252

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
10 changes: 9 additions & 1 deletion logs/journald_reader.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ import (
"k8s.io/klog/v2"
)

const (
journaldPollTimeout = 100 * time.Millisecond
)

type JournaldReader struct {
journal *sdjournal.Journal
subscribers map[string]chan<- logparser.LogEntry
Expand Down Expand Up @@ -60,7 +64,11 @@ func (r *JournaldReader) follow() {
return
}
if c <= 0 {
r.journal.Wait(time.Millisecond * 100)
t := time.Now()
ret := r.journal.Wait(journaldPollTimeout)
if ret <= 0 && time.Since(t) < journaldPollTimeout { // inotify can't work due to system limits
time.Sleep(journaldPollTimeout)
}
continue
}
e, err := r.journal.GetEntry()
Expand Down