Fix race that can lead to panic during seal (#23906)

* Fix race that can lead to panic during seal * Add changelog
hashicorp · Oct 30, 2023 · 0634564 · 0634564
1 parent 66494c8
commit 0634564
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/changelog/23906.txt b/changelog/23906.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+core: fix rare panic due to a race condition with metrics collection during seal
+```
diff --git a/vault/core_metrics.go b/vault/core_metrics.go
@@ -597,14 +597,14 @@ func (c *Core) inFlightReqGaugeMetric() {
 
 // configuredPoliciesGaugeCollector is used to collect gauge label values for the `vault.policy.configured.count` metric
 func (c *Core) configuredPoliciesGaugeCollector(ctx context.Context) ([]metricsutil.GaugeLabelValues, error) {
-	if c.policyStore == nil {
-		return []metricsutil.GaugeLabelValues{}, nil
-	}
-
 	c.stateLock.RLock()
 	policyStore := c.policyStore
 	c.stateLock.RUnlock()
 
+	if policyStore == nil {
+		return []metricsutil.GaugeLabelValues{}, nil
+	}
+
 	ctx = namespace.RootContext(ctx)
 	namespaces := c.collectNamespaces()