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

nsqd: message loss during topic/channel bootstrap from metadata #1032

Merged
merged 1 commit into from
May 22, 2018
Merged

nsqd: message loss during topic/channel bootstrap from metadata #1032

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
16 changes: 13 additions & 3 deletions nsqd/nsqd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,9 +358,6 @@ func (n *NSQD) LoadMetadata() error {
continue
}
topic := n.GetTopic(t.Name)
if t.Paused {
topic.Pause()
}

for _, c := range t.Channels {
if !protocol.IsValidChannelName(c.Name) {
Expand All @@ -372,6 +369,12 @@ func (n *NSQD) LoadMetadata() error {
channel.Pause()
}
}

// this logic is reversed, and done _after_ channel creation to ensure that all channels
// are created before messages begin flowing
if !t.Paused {
topic.UnPause()
}
}
return nil
}
Expand Down Expand Up @@ -515,6 +518,13 @@ func (n *NSQD) GetTopic(topicName string) *Topic {
t = NewTopic(topicName, &context{n}, deleteCallback)
n.topicMap[topicName] = t

// if we're creating a new topic in this process while we're loading from metadata, the topic may already
// have message data persisted on disk. To ensure that all channels are created before message flow
// begins, we pause the topic.
if atomic.LoadInt32(&n.isLoading) == 1 {
t.Pause()
}

n.logf(LOG_INFO, "TOPIC(%s): created", t.name)

// release our global nsqd lock, and switch to a more granular topic lock while we init our
Expand Down