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

Cherry-pick #12125 to 7.0: Fix goroutine leak on initialization failures of log input #12143

Merged
merged 2 commits into from
May 10, 2019
Merged

Cherry-pick #12125 to 7.0: Fix goroutine leak on initialization failures of log input #12143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2acd206
Fix goroutine leak on initialization failures of log input (#12125)
jsoriano May 9, 2019
6cc79d4
Merge remote-tracking branch 'origin/7.0' into backport_12125_7.0
jsoriano May 10, 2019
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
1 change: 1 addition & 0 deletions CHANGELOG.next.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ https://github.com/elastic/beats/compare/v7.0.0...7.0[Check the HEAD diff]

*Filebeat*

- Fix goroutine leak caused on initialization failures of log input. {pull}12125[12125]
- Fix memory leak in Filebeat pipeline acker. {pull}12063[12063]

*Heartbeat*
Expand Down
9 changes: 9 additions & 0 deletions filebeat/input/log/input.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,12 @@ func NewInput(
outlet channel.Connector,
context input.Context,
) (input.Input, error) {
cleanupNeeded := true
cleanupIfNeeded := func(f func() error) {
if cleanupNeeded {
f()
}
}

// Note: underlying output.
// The input and harvester do have different requirements
Expand All @@ -87,11 +93,13 @@ func NewInput(
if err != nil {
return nil, err
}
defer cleanupIfNeeded(out.Close)

// stateOut will only be unblocked if the beat is shut down.
// otherwise it can block on a full publisher pipeline, so state updates
// can be forwarded correctly to the registrar.
stateOut := channel.CloseOnSignal(channel.SubOutlet(out), context.BeatDone)
defer cleanupIfNeeded(stateOut.Close)

meta := context.Meta
if len(meta) == 0 {
Expand Down Expand Up @@ -137,6 +145,7 @@ func NewInput(

logp.Info("Configured paths: %v", p.config.Paths)

cleanupNeeded = false
return p, nil
}

Expand Down