upstream/vault
1
0
Fork 0
mirror of https://github.com/hashicorp/vault.git synced 2026-02-18 18:38:08 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Stop copying sync.Maps, which is forbidden. (#24027)

Browse source
This commit is contained in:
Nick Cabatoff 2023-11-06 10:26:27 -05:00 committed by GitHub
parent b19562db9a
commit 7ec3867eea
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
changelog/24027.txt Normal file
View file

@ -0,0 +1,3 @@
```release-note:bug
expiration: Fix fatal error "concurrent map iteration and map write" when collecting metrics from leases.
```

6
vault/expiration.go
View file

@ -879,7 +879,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)
@ -2485,7 +2485,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 {
@ -2514,7 +2514,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 {