nsqd fix topic.messageCount error #1108

李洺吉 · SwanSpouse · commit 43a84e6d3bec · 2018-12-01T11:35:04.000+08:00
diff --git a/nsqd/topic.go b/nsqd/topic.go
@@ -194,9 +194,10 @@ func (t *Topic) PutMessages(msgs []*Message) error {
 	if atomic.LoadInt32(&t.exitFlag) == 1 {
 		return errors.New("exiting")
 	}
-	for _, m := range msgs {
+	for i, m := range msgs {
 		err := t.put(m)
 		if err != nil {
+			atomic.AddUint64(&t.messageCount, uint64(i))
 			return err
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -194,9 +194,10 @@ func (t Topic) PutMessages(msgs []Message) error {`
`194`	`194`	`if atomic.LoadInt32(&t.exitFlag) == 1 {`
`195`	`195`	`return errors.New("exiting")`
`196`	`196`	`}`
`197`		`- for _, m := range msgs {`
	`197`	`+ for i, m := range msgs {`
`198`	`198`	`err := t.put(m)`
`199`	`199`	`if err != nil {`
	`200`	`+ atomic.AddUint64(&t.messageCount, uint64(i))`
`200`	`201`	`return err`
`201`	`202`	`}`
`202`	`203`	`}`