From 559ea7f247118eec9290d37793a217b116e73ddb Mon Sep 17 00:00:00 2001
From: buffer <1045931706@qq.com>
Date: Tue, 19 Sep 2023 05:45:10 +0800
Subject: [PATCH] config: enable store limit v2 in raftstore-v2 (#7098)

close tikv/pd#7099

Co-authored-by: ti-chi-bot[bot] <108142056+ti-chi-bot[bot]@users.noreply.github.com>
---
 server/cluster/cluster.go        | 2 +-
 server/cluster/cluster_test.go   | 4 ++++
 server/config/persist_options.go | 6 ++++++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/server/cluster/cluster.go b/server/cluster/cluster.go
index 29a8709bdac..1b2bc75e334 100644
--- a/server/cluster/cluster.go
+++ b/server/cluster/cluster.go
@@ -436,7 +436,7 @@ func (c *RaftCluster) runStoreConfigSync() {
 	for {
 		synced, switchRaftV2Config = c.syncStoreConfig(stores)
 		if switchRaftV2Config {
-			if err := c.opt.Persist(c.GetStorage()); err != nil {
+			if err := c.opt.SwitchRaftV2(c.GetStorage()); err != nil {
 				log.Warn("store config persisted failed", zap.Error(err))
 			}
 		}
diff --git a/server/cluster/cluster_test.go b/server/cluster/cluster_test.go
index ea8d27b155f..5679fd6128d 100644
--- a/server/cluster/cluster_test.go
+++ b/server/cluster/cluster_test.go
@@ -1469,6 +1469,10 @@ func TestStoreConfigSync(t *testing.T) {
 	err = opt.Reload(tc.GetStorage())
 	re.NoError(err)
 	re.Equal(tc.GetOpts().(*config.PersistOptions).GetStoreConfig(), opt.GetStoreConfig())
+
+	re.Equal("v1", opt.GetScheduleConfig().StoreLimitVersion)
+	re.NoError(opt.SwitchRaftV2(tc.GetStorage()))
+	re.Equal("v2", opt.GetScheduleConfig().StoreLimitVersion)
 }
 
 func TestUpdateStorePendingPeerCount(t *testing.T) {
diff --git a/server/config/persist_options.go b/server/config/persist_options.go
index 1ea0b79424f..3f1c4d4a24e 100644
--- a/server/config/persist_options.go
+++ b/server/config/persist_options.go
@@ -762,6 +762,12 @@ type persistedConfig struct {
 	StoreConfig sc.StoreConfig `json:"store"`
 }
 
+// SwitchRaftV2 update some config if tikv raft engine switch into partition raft v2
+func (o *PersistOptions) SwitchRaftV2(storage endpoint.ConfigStorage) error {
+	o.GetScheduleConfig().StoreLimitVersion = "v2"
+	return o.Persist(storage)
+}
+
 // Persist saves the configuration to the storage.
 func (o *PersistOptions) Persist(storage endpoint.ConfigStorage) error {
 	cfg := &persistedConfig{