From 75bb7963d68c5a5ccdbe9154062fa59a33ad538f Mon Sep 17 00:00:00 2001 From: Hu# Date: Thu, 24 Aug 2023 14:53:06 +0800 Subject: [PATCH] region: remove error return logic (#6982) ref tikv/pd#6920 Signed-off-by: husharp --- server/core/region.go | 2 -- tests/server/region_syncer/region_syncer_test.go | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/server/core/region.go b/server/core/region.go index 8870d30b57a..07b522e47ca 100644 --- a/server/core/region.go +++ b/server/core/region.go @@ -694,14 +694,12 @@ func GenerateRegionGuideFunc(enableLog bool) RegionGuideFunc { (region.GetReplicationStatus().GetState() != origin.GetReplicationStatus().GetState() || region.GetReplicationStatus().GetStateId() != origin.GetReplicationStatus().GetStateId()) { saveCache = true - return } // Do not save to kv, because 1) flashback will be eventually set to // false, 2) flashback changes almost all regions in a cluster. // Saving kv may downgrade PD performance when there are many regions. if region.IsFlashbackChanged(origin) { saveCache = true - return } if !origin.IsFromHeartbeat() { isNew = true diff --git a/tests/server/region_syncer/region_syncer_test.go b/tests/server/region_syncer/region_syncer_test.go index 3efe04e506d..0e03b558fc2 100644 --- a/tests/server/region_syncer/region_syncer_test.go +++ b/tests/server/region_syncer/region_syncer_test.go @@ -234,6 +234,8 @@ func TestPrepareChecker(t *testing.T) { leaderServer = cluster.GetServer(cluster.GetLeader()) rc = leaderServer.GetServer().GetRaftCluster() for _, region := range regions { + // Need to check if the region was recognized `isNew`. + region = region.Clone(core.WithFlashback(true, 1)) err = rc.HandleRegionHeartbeat(region) re.NoError(err) }