Speculative fix for a panic that might arise during raft teardown (#1…

…8704)
hashicorp · Feb 3, 2023 · 2ae342b · 2ae342b
1 parent ac9da60
commit 2ae342b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/changelog/18704.txt b/changelog/18704.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+storage/raft: Fix race with follower heartbeat tracker during teardown.
+```
diff --git a/physical/raft/raft_autopilot.go b/physical/raft/raft_autopilot.go
@@ -551,6 +551,13 @@ func (b *RaftBackend) startFollowerHeartbeatTracker() {
 	}
 	for range tickerCh {
 		b.l.RLock()
+		if b.raft == nil {
+			// We could be racing with teardown, which will stop the ticker
+			// but that doesn't guarantee that we won't reach this line with a nil
+			// b.raft.
+			b.l.RUnlock()
+			return
+		}
 		b.followerStates.l.RLock()
 		myAppliedIndex := b.raft.AppliedIndex()
 		for peerID, state := range b.followerStates.followers {