Merge #61868

61868: testutils: fix a nil pointer panic in TestCluster.GetRaftLeader r=lunevalex a=lunevalex Fixes #61485 TestReplicateRemovedNodeDisruptiveElection exposed a nil pointer panic in TestCluster.GetRaftLeader. Replica.RaftStatus could return nil if the raft group is not yet initilized. This commit adds a guard for that condition. Release note: None Co-authored-by: Alex Lunev <[email protected]>
cockroachdb · Mar 11, 2021 · 38d3138 · 38d3138
2 parents 5e4e48f + c23edf3
commit 38d3138
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/pkg/testutils/testcluster/testcluster.go b/pkg/testutils/testcluster/testcluster.go
@@ -1394,6 +1394,9 @@ func (tc *TestCluster) GetRaftLeader(t testing.TB, key roachpb.RKey) *kvserver.R
 					return nil
 				}
 				raftStatus := repl.RaftStatus()
+				if raftStatus == nil {
+					return errors.Errorf("raft group is not initialized for replica with key %s", key)
+				}
 				if raftStatus.Term > latestTerm || (raftLeaderRepl == nil && raftStatus.Term == latestTerm) {
 					// If we find any newer term, it means any previous election is
 					// invalid.