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

physical/raft: Add nil check to shutdown (#9322)

Browse Source
This commit is contained in:
Alexander Bezobchuk 2020-06-25 20:51:13 -04:00 committed by GitHub
parent 26177d22f5
commit 08c83d341d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
physical/raft/raft.go
View File

@ -729,14 +729,25 @@ func (b *RaftBackend) TeardownCluster(clusterListener cluster.ClusterHook) error
} }
b.l.Lock() b.l.Lock()
future := b.raft.Shutdown()
// Perform shutdown only if the raft object is non-nil. The object could be nil
// if the node is unsealed but has not joined the peer set.
var future raft.Future
if b.raft != nil {
future = b.raft.Shutdown()
}
b.raft = nil b.raft = nil
// If we're tearing down, then we need to recreate the raftInitCh // If we're tearing down, then we need to recreate the raftInitCh
b.raftInitCh = make(chan struct{}) b.raftInitCh = make(chan struct{})
b.l.Unlock() b.l.Unlock()
if future != nil {
return future.Error() return future.Error()
}
return nil
} }
// CommittedIndex returns the latest index committed to stable storage // CommittedIndex returns the latest index committed to stable storage