core: change scoreV2 to adapt the higher disk capacity and amp . (#4837…

…) (#4848) close #4805, ref #4837 Signed-off-by: bufferflies <[email protected]> Co-authored-by: bufferflies <[email protected]>
tikv · Jul 18, 2022 · b351859 · b351859
1 parent 82dd74c
commit b351859
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/server/core/store.go b/server/core/store.go
@@ -348,7 +348,7 @@ func (s *StoreInfo) regionScoreV2(delta int64, lowSpaceRatio float64) float64 {
 	var (
 		K, M float64 = 1, 256 // Experience value to control the weight of the available influence on score
 		F    float64 = 50     // Experience value to prevent some nodes from running out of disk space prematurely.
-		B            = 1e7
+		B            = 1e10
 	)
 	F = math.Max(F, C*(1-lowSpaceRatio))
 	var score float64

diff --git a/server/core/store_test.go b/server/core/store_test.go
@@ -141,8 +141,8 @@ func (s *testStoreSuite) TestLowSpaceScoreV2(c *C) {
 		small:  NewStoreInfoWithAvailable(2, 10*gb, 100*gb, 1.4),
 	}, {
 		// store1 and store2 has same available ratio less than 0.2
-		bigger: NewStoreInfoWithAvailable(1, 10*gb, 1000*gb, 1.4),
-		small:  NewStoreInfoWithAvailable(2, 1*gb, 100*gb, 1.4),
+		bigger: NewStoreInfoWithAvailable(1, 20*gb, 1000*gb, 1.4),
+		small:  NewStoreInfoWithAvailable(2, 10*gb, 500*gb, 1.4),
 	}, {
 		// store1 and store2 has same available ratio
 		// but the store1 ratio less than store2 ((50-10)/50=0.8<(200-100)/200=0.5)
@@ -163,6 +163,10 @@ func (s *testStoreSuite) TestLowSpaceScoreV2(c *C) {
 		// but store1 has higher amp, so store1(60g) has more regionSize (40g)
 		bigger: NewStoreInfoWithAvailable(1, 80*gb, 100*gb, 3),
 		small:  NewStoreInfoWithAvailable(2, 60*gb, 100*gb, 1),
+	}, {
+		// store1's capacity is less than store2's capacity, but store2 has more available space,
+		bigger: NewStoreInfoWithAvailable(1, 2*gb, 100*gb, 3),
+		small:  NewStoreInfoWithAvailable(2, 100*gb, 10*1000*gb, 3),
 	}}
 	for _, v := range testdata {
 		score1 := v.bigger.regionScoreV2(0, 0.8)

diff --git a/server/core/test_util.go b/server/core/test_util.go
@@ -83,7 +83,7 @@ func NewTestRegionInfo(start, end []byte) *RegionInfo {
 	}}
 }
 
-// NewStoreInfoWithAvailable is create with available and capacity
+// NewStoreInfoWithAvailable is created with available and capacity
 func NewStoreInfoWithAvailable(id, available, capacity uint64, amp float64) *StoreInfo {
 	stats := &pdpb.StoreStats{}
 	stats.Capacity = capacity