Merge branch 'master' into fix-unhealthy-repair

nolouch · Jul 21, 2023 · b3e3e00 · b3e3e00
2 parents cf1d5ac + 4d9455d
commit b3e3e00
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/pkg/schedule/splitter/region_splitter.go b/pkg/schedule/splitter/region_splitter.go
@@ -147,6 +147,9 @@ func (r *RegionSplitter) groupKeysByRegion(keys [][]byte) map[uint64]*regionGrou
 		if !r.checkRegionValid(region) {
 			continue
 		}
+		if bytes.Equal(region.GetStartKey(), key) {
+			continue
+		}
 		log.Info("found region",
 			zap.Uint64("region-id", region.GetID()),
 			logutil.ZapRedactByteString("key", key))
@@ -166,9 +169,6 @@ func (r *RegionSplitter) groupKeysByRegion(keys [][]byte) map[uint64]*regionGrou
 }
 
 func (r *RegionSplitter) checkRegionValid(region *core.RegionInfo) bool {
-	if r.cluster.IsRegionHot(region) {
-		return false
-	}
 	if !filter.IsRegionReplicated(r.cluster, region) {
 		r.cluster.AddSuspectRegions(region.GetID())
 		return false

diff --git a/pkg/schedule/splitter/region_splitter_test.go b/pkg/schedule/splitter/region_splitter_test.go
@@ -122,7 +122,7 @@ func (suite *regionSplitterTestSuite) TestGroupKeysByRegion() {
 		[]byte("fff"),
 		[]byte("zzz"),
 	})
-	suite.Len(groupKeys, 3)
+	suite.Len(groupKeys, 2)
 	for k, v := range groupKeys {
 		switch k {
 		case uint64(1):
@@ -131,9 +131,6 @@ func (suite *regionSplitterTestSuite) TestGroupKeysByRegion() {
 		case uint64(2):
 			suite.Len(v.keys, 1)
 			suite.Equal([]byte("ddd"), v.keys[0])
-		case uint64(3):
-			suite.Len(v.keys, 1)
-			suite.Equal([]byte("fff"), v.keys[0])
 		}
 	}
 }