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 in WatchSet.watchMany #128

Merged
merged 2 commits into from
Oct 20, 2022
Merged
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
6 changes: 5 additions & 1 deletion watch.go
Original file line number Diff line number Diff line change
Expand Up @@ -91,10 +91,14 @@ func (w WatchSet) WatchCtx(ctx context.Context) error {

// watchMany is used if there are many watchers.
func (w WatchSet) watchMany(ctx context.Context) error {
// Cancel all watcher goroutines when return.
watcherCtx, cancel := context.WithCancel(ctx)
defer cancel()

// Set up a goroutine for each watcher.
triggerCh := make(chan struct{}, 1)
watcher := func(chunk []<-chan struct{}) {
if err := watchFew(ctx, chunk); err == nil {
if err := watchFew(watcherCtx, chunk); err == nil {
select {
case triggerCh <- struct{}{}:
default:
Expand Down