Merge pull request #2432 from influxdb/truncation_rix

RLock broker during topic truncation
influxdata · Apr 26, 2015 · 8b12472 · 8b12472
2 parents 885f25c + 812a73c
commit 8b12472
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/messaging/broker.go b/messaging/broker.go
@@ -285,6 +285,9 @@ func (b *Broker) startTopicTruncation() {
 // TruncateTopics forces topics to truncate such that they are equal to
 // or less than the requested size, if possible.
 func (b *Broker) TruncateTopics() {
+	b.mu.RLock()
+	defer b.mu.RUnlock()
+
 	for _, t := range b.topics {
 		if n, err := t.Truncate(b.MaxTopicSize); err != nil {
 			b.Logger.Printf("error truncating topic %s: %s", t.Path(), err.Error())