fix panic caused by nil pointer

ref tikv#5638 Signed-off-by: Wenbo Zhang <ethercflow@gmail.com>
ethercflow · Nov 2, 2022 · b01638c · b01638c
1 parent 0f706eb
commit b01638c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/server/cluster/coordinator_test.go b/server/cluster/coordinator_test.go
@@ -859,6 +859,7 @@ func TestRemoveScheduler(t *testing.T) {
 	re.NoError(co.removeScheduler(schedulers.HotRegionName))
 	re.NoError(co.removeScheduler(schedulers.GrantLeaderName))
 	re.NoError(co.removeScheduler(schedulers.SplitBucketName))
+	re.NoError(co.removeScheduler(schedulers.TransferWitnessLeaderName))
 	// all removed
 	sches, _, err = storage.LoadAllScheduleConfig()
 	re.NoError(err)
@@ -877,7 +878,7 @@ func TestRemoveScheduler(t *testing.T) {
 	co.run()
 	re.Empty(co.schedulers)
 	// the option remains default scheduler
-	re.Len(co.cluster.opt.GetSchedulers(), 4)
+	re.Len(co.cluster.opt.GetSchedulers(), 5)
 	co.stop()
 	co.wg.Wait()
 }

diff --git a/server/schedulers/transfer_witness_leader.go b/server/schedulers/transfer_witness_leader.go
@@ -135,6 +135,9 @@ func (s *transferLeaderScheduler) scheduleTransferWitnessLeader(name, typ string
 }
 
 func NeedTransferWitnessLeader(region *core.RegionInfo) bool {
+	if region == nil || region.GetLeader() == nil {
+		return false
+	}
 	return region.GetLeader().IsWitness
 }