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

binarylog: Don't leak the flusher goroutine when closing a Sink #4583

Merged
merged 1 commit into from Jul 7, 2021
Merged

binarylog: Don't leak the flusher goroutine when closing a Sink #4583

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 9 additions & 1 deletion internal/binarylog/sink.go
View file
Open in desktop
Expand Up @@ -92,6 +92,7 @@ type bufferedSink struct {

writeStartOnce sync.Once
writeTicker *time.Ticker
done chan struct{}
}

func (fs *bufferedSink) Write(e *pb.GrpcLogEntry) error {
Expand All @@ -113,7 +114,12 @@ const (
func (fs *bufferedSink) startFlushGoroutine() {
fs.writeTicker = time.NewTicker(bufFlushDuration)
go func() {
for range fs.writeTicker.C {
for {
select {
case <-fs.done:
return
case <-fs.writeTicker.C:
}
fs.mu.Lock()
if err := fs.buf.Flush(); err != nil {
grpclogLogger.Warningf("failed to flush to Sink: %v", err)
Expand All @@ -127,6 +133,7 @@ func (fs *bufferedSink) Close() error {
if fs.writeTicker != nil {
fs.writeTicker.Stop()
}
close(fs.done)
fs.mu.Lock()
if err := fs.buf.Flush(); err != nil {
grpclogLogger.Warningf("failed to flush to Sink: %v", err)
Expand Down Expand Up @@ -155,5 +162,6 @@ func NewBufferedSink(o io.WriteCloser) Sink {
closer: o,
out: newWriterSink(bufW),
buf: bufW,
done: make(chan struct{}),
}
}