mirrors/vault
1
0
Fork 0
mirror of https://github.com/hashicorp/vault.git synced 2025-08-30 11:01:09 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1627 from hashicorp/rollback-nil-race

Browse Source 
Ensure mount/auth tables are not nil when triggering rollback
This commit is contained in:
Jeff Mitchell 2016-07-18 22:03:38 -04:00 committed by GitHub
commit a68d34100b
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
vault/rollback.go
View File

@ -192,13 +192,21 @@ func (c *Core) startRollback() error {
ret := []*MountEntry{} ret := []*MountEntry{}
c.mountsLock.RLock() c.mountsLock.RLock()
defer c.mountsLock.RUnlock() defer c.mountsLock.RUnlock()
for _, entry := range c.mounts.Entries { // During teardown/setup after a leader change or unseal there could be
ret = append(ret, entry) // something racy here so make sure the table isn't nil
if c.mounts != nil {
for _, entry := range c.mounts.Entries {
ret = append(ret, entry)
}
} }
c.authLock.RLock() c.authLock.RLock()
defer c.authLock.RUnlock() defer c.authLock.RUnlock()
for _, entry := range c.auth.Entries { // During teardown/setup after a leader change or unseal there could be
ret = append(ret, entry) // something racy here so make sure the table isn't nil
if c.auth != nil {
for _, entry := range c.auth.Entries {
ret = append(ret, entry)
}
} }
return ret return ret
} }