Skip to content

Commit

Permalink
Fix goroutine leak on initialization failures of log input (elastic#1…
Browse files Browse the repository at this point in the history
…2125)

Outlets are created during log input initialization, and if it
fails they were never freed. Handle this case.
  • Loading branch information
jsoriano authored and ph committed May 21, 2019
1 parent 44df638 commit 7cdda44
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 0 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.next.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
- Add missing Kubernetes metadata fields to Filebeat CoreDNS module, and fix a documentation error. {pull}11591[11591]
- Reduce memory usage if long lines are truncated to fit `max_bytes` limit. The line buffer is copied into a smaller buffer now. This allows the runtime to release unused memory earlier. {pull}11524[11524]
- Fix memory leak in Filebeat pipeline acker. {pull}12063[12063]
- Fix goroutine leak caused on initialization failures of log input. {pull}12125[12125]

*Heartbeat*

Expand Down
9 changes: 9 additions & 0 deletions filebeat/input/log/input.go
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

0 comments on commit 7cdda44

Please sign in to comment.