Merge pull request prometheus#2021 from prometheus/beorn7/storage

Avoid `defer` in seriesMap.get
sman591 · Sep 22, 2016 · 71b3322 · 71b3322
2 parents 2ee00b4 + ca98382
commit 71b3322
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/storage/local/series.go b/storage/local/series.go
@@ -66,9 +66,11 @@ func (sm *seriesMap) length() int {
 // semantics as the native Go map.
 func (sm *seriesMap) get(fp model.Fingerprint) (s *memorySeries, ok bool) {
 	sm.mtx.RLock()
-	defer sm.mtx.RUnlock()
-
 	s, ok = sm.m[fp]
+	// Note that the RUnlock is not done via defer for performance reasons.
+	// TODO(beorn7): Once https://github.com/golang/go/issues/14939 is
+	// fixed, revert to the usual defer idiom.
+	sm.mtx.RUnlock()
 	return
 }