Skip to content

event, p2p/simulations/adapters: use buffered channel to avoid goroutine leak #20657

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

Merged
merged 3 commits into from
Feb 12, 2020
Merged

event, p2p/simulations/adapters: use buffered channel to avoid goroutine leak #20657

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
da12747
event, p2p/simulations/adapters: use buffered channel to avoid gorout…
Chain-Fox Feb 12, 2020
5968e03
event: improve fix for the goroutine leak in resubscribe
fjl Feb 12, 2020
4f7eef6
event: fix test
fjl Feb 12, 2020
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
2 changes: 1 addition & 1 deletion event/subscription.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ func (s *resubscribeSub) loop() {
}

func (s *resubscribeSub) subscribe() Subscription {
subscribed := make(chan error)
subscribed := make(chan error, 1)
Copy link
Contributor

@fjl fjl Feb 12, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it would be better to fix this case by waiting on the subscribed channel when the subscribe loop exits. This way, Unsubscribe will block until the goroutine running s.fn has exited.

Copy link
Contributor

@fjl fjl Feb 12, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually, I have now applied the fix myself.

var sub Subscription
retry:
for {
Expand Down
2 changes: 1 addition & 1 deletion p2p/simulations/adapters/exec.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ func (n *ExecNode) Stop() error {
if err := n.Cmd.Process.Signal(syscall.SIGTERM); err != nil {
return n.Cmd.Process.Kill()
}
waitErr := make(chan error)
waitErr := make(chan error, 1)
Copy link
Contributor

@fjl fjl Feb 12, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This fix is OK as-is.

go func() {
waitErr <- n.Cmd.Wait()
}()
Expand Down