scottk/vault
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/vault.git synced 2025-10-30 18:17:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
* Fix race that can lead to panic during seal

* Add changelog
This commit is contained in:
Paul Banks
2023-10-30 18:26:33 +00:00
committed by GitHub
parent 66494c8129
commit 063456495a
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
changelog/23906.txt Normal file
View File

@@ -0,0 +1,3 @@
```release-note:bug
core: fix rare panic due to a race condition with metrics collection during seal
```

8
vault/core_metrics.go
View File

@@ -597,14 +597,14 @@ func (c *Core) inFlightReqGaugeMetric() {
// configuredPoliciesGaugeCollector is used to collect gauge label values for the `vault.policy.configured.count` metric // 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) { func (c *Core) configuredPoliciesGaugeCollector(ctx context.Context) ([]metricsutil.GaugeLabelValues, error) {
if c.policyStore == nil {
return []metricsutil.GaugeLabelValues{}, nil
}
c.stateLock.RLock() c.stateLock.RLock()
policyStore := c.policyStore policyStore := c.policyStore
c.stateLock.RUnlock() c.stateLock.RUnlock()
if policyStore == nil {
return []metricsutil.GaugeLabelValues{}, nil
}
ctx = namespace.RootContext(ctx) ctx = namespace.RootContext(ctx)
namespaces := c.collectNamespaces() namespaces := c.collectNamespaces()