Skip to content

node: remove potential deadlock on chan capacity of zero #1116

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
MSevey merged 1 commit into from
Jul 31, 2023
Merged

node: remove potential deadlock on chan capacity of zero #1116

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 10 additions & 8 deletions node/full_client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -829,14 +829,16 @@ func (c *FullClient) eventsRoutine(sub cmtypes.Subscription, subscriber string,
select {
case msg := <-sub.Out():
result := ctypes.ResultEvent{Query: q.String(), Data: msg.Data(), Events: msg.Events()}
if cap(outc) == 0 {
outc <- result
} else {
select {
case outc <- result:
default:
c.Logger.Error("wanted to publish ResultEvent, but out channel is full", "result", result, "query", result.Query)
}
select {
case outc <- result:
default:
// The default case can happen if the outc chan
// is full or if it was initialized incorrectly
// with a capacity of 0. Since this function has
// no control over re-initializing the outc
// chan, we do not block on a capacity of 0.
full := cap(outc) != 0
c.Logger.Error("wanted to publish ResultEvent, but out channel is full:", full, "result:", result, "query:", result.Query)
}
case <-sub.Cancelled():
if sub.Err() == cmpubsub.ErrUnsubscribed {
Expand Down