Merge pull request #2287 from influxdb/default_rp_race

RLock server for SHOW RETENTION POLICIES
influxdata · Apr 15, 2015 · dc5a1af · dc5a1af
2 parents ba90815 + 37c42c9
commit dc5a1af
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ### Bugfixes
 - [#2282](https://github.com/influxdb/influxdb/pull/2282): Use "value" as field name for OpenTSDB input.
 - [#2283](https://github.com/influxdb/influxdb/pull/2283): Fix bug when restarting an entire existing cluster.
+- [#2287](https://github.com/influxdb/influxdb/pull/2287): Fix data race during SHOW RETENTION POLICIES.
 
 ## Features
 - [#2276](https://github.com/influxdb/influxdb/pull/2276): Broker topic truncation.

diff --git a/server.go b/server.go
@@ -3018,6 +3018,9 @@ func (s *Server) executeDropRetentionPolicyStatement(q *influxql.DropRetentionPo
 }
 
 func (s *Server) executeShowRetentionPoliciesStatement(q *influxql.ShowRetentionPoliciesStatement, user *User) *Result {
+	s.mu.RLock()
+	defer s.mu.RUnlock()
+
 	a, err := s.RetentionPolicies(q.Database)
 	if err != nil {
 		return &Result{Err: err}