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.

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 goroutine leak on non-explicit finalization of log inputs #12164

Merged
merged 4 commits into from
May 20, 2019
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
- 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]
- Fix goroutine leak on non-explicit finalization of log input. {pull}12164[12164]

*Heartbeat*

Expand Down
35 changes: 27 additions & 8 deletions filebeat/input/log/input.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import (
"path/filepath"
"sort"
"strings"
"sync"
"time"

"github.com/elastic/beats/filebeat/channel"
Expand Down Expand Up @@ -68,6 +69,7 @@ type Input struct {
done chan struct{}
numHarvesters atomic.Uint32
meta map[string]string
stopOnce sync.Once
}

// NewInput instantiates a new Log
Expand Down Expand Up @@ -146,6 +148,8 @@ func NewInput(
logp.Info("Configured paths: %v", p.config.Paths)

cleanupNeeded = false
p.stopWhenDone()

return p, nil
}

Expand Down Expand Up @@ -727,14 +731,29 @@ func (p *Input) Wait() {

// Stop stops all harvesters and then stops the input
func (p *Input) Stop() {
// Stop all harvesters
// In case the beatDone channel is closed, this will not wait for completion
// Otherwise Stop will wait until output is complete
p.harvesters.Stop()
p.stopOnce.Do(func() {
// Stop all harvesters
// In case the beatDone channel is closed, this will not wait for completion
// Otherwise Stop will wait until output is complete
p.harvesters.Stop()

// close state updater
p.stateOutlet.Close()

// stop all communication between harvesters and publisher pipeline
p.outlet.Close()
})
}

// close state updater
p.stateOutlet.Close()
// stopWhenDone takes care of stopping the input if some of the contexts are done
func (p *Input) stopWhenDone() {
go func() {
jsoriano marked this conversation as resolved.
Show resolved Hide resolved
select {
case <-p.done:
case <-p.stateOutlet.Done():
case <-p.outlet.Done():
}

// stop all communication between harvesters and publisher pipeline
p.outlet.Close()
p.Stop()
}()
}