Skip to content
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

fix(inputs.tail): Prevent deadlock when closing and max undelivered lines hit #15649

Merged
merged 1 commit into from
Jul 24, 2024
Merged

fix(inputs.tail): Prevent deadlock when closing and max undelivered lines hit #15649

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
5 changes: 5 additions & 0 deletions plugins/inputs/tail/tail.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,6 +370,11 @@ func (t *Tail) receiver(parser telegraf.Parser, tailer *tail.Tail) {
select {
case <-t.ctx.Done():
return
// Tail is trying to close so drain the sem to allow the receiver
// to exit. This condition is hit when the tailer may have hit the
// maximum undelivered lines and is trying to close.
case <-tailer.Dying():
<-t.sem
case t.sem <- empty{}:
t.acc.AddTrackingMetricGroup(metrics)
}
Expand Down
Loading