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: Unsubscribe required on exit #6103

Merged
merged 1 commit into from
Aug 17, 2023
Merged
Changes from all commits
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
18 changes: 13 additions & 5 deletions pkg/chain/store.go
Original file line number Diff line number Diff line change
Expand Up @@ -695,8 +695,17 @@ func (store *Store) SubHeadChanges(ctx context.Context) chan []*types.HeadChange
}}

go func() {
defer close(out)
var unsubOnce sync.Once
defer func() {
// Tell the caller we're done first, the following may block for a bit.
close(out)

// Unsubscribe.
store.headEvents.Unsub(subCh)

// Drain the channel.
for range subCh {
}
}()

for {
select {
Expand All @@ -716,9 +725,8 @@ func (store *Store) SubHeadChanges(ctx context.Context) chan []*types.HeadChange
log.Warnf("head change sub is slow, has %d buffered entries", len(out))
}
case <-ctx.Done():
unsubOnce.Do(func() {
go store.headEvents.Unsub(subCh)
})
log.Infof("exit sub head change: %v", ctx.Err())
return
}
}
}()
Expand Down