backport of commit 7ec3867 (#24031)

Co-authored-by: Nick Cabatoff <ncabatoff@hashicorp.com>
hashicorp · Nov 6, 2023 · 5efc0cb · 5efc0cb
1 parent 891eb6f
commit 5efc0cb
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/changelog/24027.txt b/changelog/24027.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+expiration: Fix fatal error "concurrent map iteration and map write" when collecting metrics from leases.
+```
diff --git a/vault/expiration.go b/vault/expiration.go
@@ -884,7 +884,7 @@ func (m *ExpirationManager) Stop() error {
 	// for the next ExpirationManager to handle them.
 	newStrategy := ExpireLeaseStrategy(expireNoop)
 	m.expireFunc.Store(&newStrategy)
-	oldPending := m.pending
+	oldPending := &m.pending
 	m.pending, m.nonexpiring, m.irrevocable = sync.Map{}, sync.Map{}, sync.Map{}
 	m.leaseCount = 0
 	m.uniquePolicies = make(map[string][]string)
@@ -2490,7 +2490,7 @@ func (m *ExpirationManager) WalkTokens(walkFn ExpirationWalkFunction) error {
 	}
 
 	m.pendingLock.RLock()
-	toWalk := []sync.Map{m.pending, m.nonexpiring}
+	toWalk := []*sync.Map{&m.pending, &m.nonexpiring}
 	m.pendingLock.RUnlock()
 
 	for _, m := range toWalk {
@@ -2519,7 +2519,7 @@ func (m *ExpirationManager) walkLeases(walkFn leaseWalkFunction) error {
 	}
 
 	m.pendingLock.RLock()
-	toWalk := []sync.Map{m.pending, m.nonexpiring}
+	toWalk := []*sync.Map{&m.pending, &m.nonexpiring}
 	m.pendingLock.RUnlock()
 
 	for _, m := range toWalk {