From 5b7985bb8bb56f41e304c17173bdbd14361a1755 Mon Sep 17 00:00:00 2001
From: JmPotato <ghzpotato@gmail.com>
Date: Tue, 25 Jun 2024 17:52:21 +0800
Subject: [PATCH] This is an automated cherry-pick of #8324

close tikv/pd#8323

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
---
 pkg/schedule/config/store_config.go      |  9 +++++++--
 pkg/schedule/config/store_config_test.go |  5 +++++
 pkg/utils/typeutil/size_test.go          | 19 +++++++++++++++----
 3 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/pkg/schedule/config/store_config.go b/pkg/schedule/config/store_config.go
index 5f898ef17c4..b7676311f3d 100644
--- a/pkg/schedule/config/store_config.go
+++ b/pkg/schedule/config/store_config.go
@@ -166,9 +166,14 @@ func (c *StoreConfig) CheckRegionSize(size, mergeSize uint64) error {
 	if size < c.GetRegionMaxSize() {
 		return nil
 	}
-
+	// This could happen when the region split size is set to a value less than 1MiB,
+	// which is a very extreme case, we just pass the check here to prevent panic.
+	regionSplitSize := c.GetRegionSplitSize()
+	if regionSplitSize == 0 {
+		return nil
+	}
 	// the smallest of the split regions can not be merge again, so it's size should less merge size.
-	if smallSize := size % c.GetRegionSplitSize(); smallSize <= mergeSize && smallSize != 0 {
+	if smallSize := size % regionSplitSize; smallSize <= mergeSize && smallSize != 0 {
 		log.Debug("region size is too small", zap.Uint64("size", size), zap.Uint64("merge-size", mergeSize), zap.Uint64("small-size", smallSize))
 		return errs.ErrCheckerMergeAgain.FastGenByArgs("the smallest region of the split regions is less than max-merge-region-size, " +
 			"it will be merged again")
diff --git a/pkg/schedule/config/store_config_test.go b/pkg/schedule/config/store_config_test.go
index 6db222d4fb0..3f4789a74c9 100644
--- a/pkg/schedule/config/store_config_test.go
+++ b/pkg/schedule/config/store_config_test.go
@@ -67,4 +67,9 @@ func TestMergeCheck(t *testing.T) {
 			re.Error(config.CheckRegionKeys(v.keys, v.mergeKeys))
 		}
 	}
+	// Test CheckRegionSize when the region split size is 0.
+	config.RegionSplitSize = "100KiB"
+	config.Adjust()
+	re.Empty(config.GetRegionSplitSize())
+	re.NoError(config.CheckRegionSize(defaultRegionMaxSize, 50))
 }
diff --git a/pkg/utils/typeutil/size_test.go b/pkg/utils/typeutil/size_test.go
index 57c246953e4..1c2aa2b217a 100644
--- a/pkg/utils/typeutil/size_test.go
+++ b/pkg/utils/typeutil/size_test.go
@@ -40,25 +40,36 @@ func TestSizeJSON(t *testing.T) {
 }
 
 func TestParseMbFromText(t *testing.T) {
+<<<<<<< HEAD
 	t.Parallel()
+=======
+	const defaultValue = 2
+
+>>>>>>> 6fbe73796 (config: fix the panic caused by zero RegionSplitSizeMB (#8324))
 	re := require.New(t)
 	testCases := []struct {
 		body []string
 		size uint64
 	}{{
 		body: []string{"10Mib", "10MiB", "10M", "10MB"},
-		size: uint64(10),
+		size: 10,
 	}, {
 		body: []string{"10GiB", "10Gib", "10G", "10GB"},
-		size: uint64(10 * units.GiB / units.MiB),
+		size: 10 * units.GiB / units.MiB,
+	}, {
+		body: []string{"1024KiB", "1048576"},
+		size: 1,
+	}, {
+		body: []string{"100KiB", "1023KiB", "1048575", "0"},
+		size: 0,
 	}, {
 		body: []string{"10yiB", "10aib"},
-		size: uint64(1),
+		size: defaultValue,
 	}}
 
 	for _, testCase := range testCases {
 		for _, b := range testCase.body {
-			re.Equal(int(testCase.size), int(ParseMBFromText(b, 1)))
+			re.Equal(testCase.size, ParseMBFromText(b, defaultValue))
 		}
 	}
 }