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

Jump to bottom

Fix a logmon goroutine and memory leak #11261

Merged
merged 4 commits into from
Oct 5, 2021
Merged

Fix a logmon goroutine and memory leak #11261

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
39b72a2
logmon: refactor Logging tests
Oct 5, 2021
60a66a1
logmon: add a test for leaked goroutines
Oct 5, 2021
6aa8913
logmon: Fix a memory leak on task restart
Oct 5, 2021
40c7720
add changelog
Oct 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions .changelog/11261.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:bug
client: Fixed a memory leak in log collector when tasks restart
```
16 changes: 11 additions & 5 deletions client/logmon/logging/rotator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ func NewFileRotator(path string, baseFile string, maxFiles int,
flushTicker: time.NewTicker(bufferFlushDuration),
logger: logger,
purgeCh: make(chan struct{}, 1),
doneCh: make(chan struct{}, 1),
doneCh: make(chan struct{}),
}

if err := rotator.lastFile(); err != nil {
Expand Down Expand Up @@ -237,8 +237,14 @@ func (f *FileRotator) createFile() error {
// flushPeriodically flushes the buffered writer every 100ms to the underlying
// file
func (f *FileRotator) flushPeriodically() {
for range f.flushTicker.C {
f.flushBuffer()
for {
select {
case <-f.flushTicker.C:
f.flushBuffer()
case <-f.doneCh:
return
}

}
}

Expand All @@ -251,9 +257,9 @@ func (f *FileRotator) Close() error {
f.flushTicker.Stop()
f.flushBuffer()

// Stop the purge go routine
// Stop the go routines
if !f.closed {
f.doneCh <- struct{}{}
close(f.doneCh)
close(f.purgeCh)
f.closed = true
f.currentFile.Close()
Expand Down