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: replace missing requeue exit check; cleanup doRequeue #843

Merged
merged 1 commit into from
Jan 2, 2017
Merged

nsqd: replace missing requeue exit check; cleanup doRequeue #843

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
23 changes: 8 additions & 15 deletions nsqd/channel.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@ func (c *Channel) IsPaused() bool {
func (c *Channel) PutMessage(m *Message) error {
c.RLock()
defer c.RUnlock()
if atomic.LoadInt32(&c.exitFlag) == 1 {
if c.Exiting() {
return errors.New("exiting")
}
err := c.put(m)
Expand Down Expand Up @@ -364,7 +364,11 @@ func (c *Channel) RequeueMessage(clientID int64, id MessageID, timeout time.Dura

if timeout == 0 {
c.exitMutex.RLock()
err := c.doRequeue(msg)
if c.Exiting() {
c.exitMutex.RUnlock()
return errors.New("exiting")
}
err := c.put(msg)
c.exitMutex.RUnlock()
return err
}
Expand Down Expand Up @@ -425,17 +429,6 @@ func (c *Channel) StartDeferredTimeout(msg *Message, timeout time.Duration) erro
return nil
}

// doRequeue performs the low level operations to requeue a message
//
// Callers of this method need to ensure that a simultaneous exit will not occur
func (c *Channel) doRequeue(m *Message) error {
err := c.put(m)
if err != nil {
return err
}
return nil
}

// pushInFlightMessage atomically adds a message to the in-flight dictionary
func (c *Channel) pushInFlightMessage(msg *Message) error {
c.inFlightMutex.Lock()
Expand Down Expand Up @@ -540,7 +533,7 @@ func (c *Channel) processDeferredQueue(t int64) bool {
if err != nil {
goto exit
}
c.doRequeue(msg)
c.put(msg)
}

exit:
Expand Down Expand Up @@ -577,7 +570,7 @@ func (c *Channel) processInFlightQueue(t int64) bool {
if ok {
client.TimedOutMessage()
}
c.doRequeue(msg)
c.put(msg)
}

exit:
Expand Down