This is an automated cherry-pick of tikv#7122

close tikv#7121 Signed-off-by: ti-chi-bot <[email protected]>
ti-chi-bot · Sep 21, 2023 · cc7a825 · cc7a825
1 parent 21b47d2
commit cc7a825
Show file tree

Hide file tree

Showing 12 changed files with 2,846 additions and 8 deletions.
diff --git a/pkg/mcs/scheduling/server/cluster.go b/pkg/mcs/scheduling/server/cluster.go
diff --git a/pkg/mock/mockcluster/mockcluster.go b/pkg/mock/mockcluster/mockcluster.go
@@ -165,8 +165,13 @@ func (mc *Cluster) AllocPeer(storeID uint64) (*metapb.Peer, error) {
 
 func (mc *Cluster) initRuleManager() {
 	if mc.RuleManager == nil {
+<<<<<<< HEAD
 		mc.RuleManager = placement.NewRuleManager(core.NewStorage(kv.NewMemoryKV()), mc, mc.GetOpts())
 		mc.RuleManager.Initialize(int(mc.GetReplicationConfig().MaxReplicas), mc.GetReplicationConfig().LocationLabels)
+=======
+		mc.RuleManager = placement.NewRuleManager(mc.GetStorage(), mc, mc.GetSharedConfig())
+		mc.RuleManager.Initialize(int(mc.GetReplicationConfig().MaxReplicas), mc.GetReplicationConfig().LocationLabels, mc.GetReplicationConfig().IsolationLevel)
+>>>>>>> 5b3d0172b (*: fix sync isolation level to default placement rule (#7122))
 	}
 }