Merge pull request #703 from mreiferson/races_703

nsqd: fix stats data race regression
nsqio · Jan 8, 2016 · 73ff4d7 · 73ff4d7
2 parents bc0a6b9 + e0ac1b2
commit 73ff4d7
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/nsqd/stats.go b/nsqd/stats.go
@@ -123,7 +123,7 @@ func (n *NSQD) GetStats() []TopicStats {
 	}
 	n.RUnlock()
 	sort.Sort(TopicsByName{realTopics})
-	topics := make([]TopicStats, 0, len(n.topicMap))
+	topics := make([]TopicStats, 0, len(realTopics))
 	for _, t := range realTopics {
 		t.RLock()
 		realChannels := make([]*Channel, 0, len(t.channelMap))
@@ -132,7 +132,7 @@ func (n *NSQD) GetStats() []TopicStats {
 		}
 		t.RUnlock()
 		sort.Sort(ChannelsByName{realChannels})
-		channels := make([]ChannelStats, 0, len(t.channelMap))
+		channels := make([]ChannelStats, 0, len(realChannels))
 		for _, c := range realChannels {
 			c.RLock()
 			clients := make([]ClientStats, 0, len(c.clients))