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

fix: channel race condition of ephemeral channel destroy & recreate #878

Closed
wants to merge 1 commit into from
Closed

fix: channel race condition of ephemeral channel destroy & recreate #878

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
10 changes: 10 additions & 0 deletions nsqd/topic.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,13 +100,23 @@ func (t *Topic) GetChannel(channelName string) *Channel {

// this expects the caller to handle locking
func (t *Topic) getOrCreateChannel(channelName string) (*Channel, bool) {
// block read when delete channel
t.RLock()
channel, ok := t.channelMap[channelName]
t.RUnlock()
if !ok {
deleteCallback := func(c *Channel) {
t.DeleteExistingChannel(c.name)
}
channel = NewChannel(t.name, channelName, t.ctx, deleteCallback)
t.Lock()
// avoid re-create channel
if oldchannel, ok := t.channelMap[channelName]; ok {
t.Unlock()
return oldchannel, false
}
t.channelMap[channelName] = channel
t.Unlock()
t.ctx.nsqd.logf("TOPIC(%s): new channel(%s)", t.name, channel.name)
return channel, true
}
Expand Down