fix conflict

Signed-off-by: Cabinfever_B <cabinfeveroier@gmail.com>

Author: CabinfeverB

server/cluster/cluster.go

@@ -1084,7 +1084,7 @@ func (c *RaftCluster) putStoreImpl(store *metapb.Store, force bool) error {
 		labels := store.GetLabels()
 		if !force {
 			// If 'force' isn't set, the given labels will merge into those labels which already existed in the store.
-			labels = s.MergeLabels(labels)
+			labels = s.Clone().MergeLabels(labels)
 		}
 		// Update an existed store.
 		s = s.Clone(

server/schedule/region_scatterer_test.go

@@ -608,7 +608,7 @@ func TestRegionHasLearner(t *testing.T) {
 	checkLeader(scatterer.ordinaryEngine.selectedLeader)
 }
 
-// TestSelectedStores tests if the peer count has changed due to the picking strategy.
+// TestSelectedStoresTooFewPeers tests if the peer count has changed due to the picking strategy.
 // Ref https://github.com/tikv/pd/issues/4565
 func (s *testScatterRegionSuite) TestSelectedStores(c *C) {
 	ctx, cancel := context.WithCancel(context.Background())
@@ -644,6 +644,43 @@ func (s *testScatterRegionSuite) TestSelectedStores(c *C) {
 	}
 }
 
+// TestSelectedStoresTooManyPeers tests if the peer count has changed due to the picking strategy.
+// Ref https://github.com/tikv/pd/issues/5909
+func TestSelectedStoresTooManyPeers(t *testing.T) {
+	re := require.New(t)
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
+	opt := config.NewTestOptions()
+	tc := mockcluster.NewCluster(ctx, opt)
+	stream := hbstream.NewTestHeartbeatStreams(ctx, tc.ID, tc, false)
+	oc := NewOperatorController(ctx, tc, stream)
+	// Add 4 stores.
+	for i := uint64(1); i <= 5; i++ {
+		tc.AddRegionStore(i, 0)
+		// prevent store from being disconnected
+		tc.SetStoreLastHeartbeatInterval(i, -10*time.Minute)
+	}
+	group := "group"
+	scatterer := NewRegionScatterer(ctx, tc, oc)
+	// priority 4 > 1 > 5 > 2 == 3
+	for i := 0; i < 1200; i++ {
+		scatterer.ordinaryEngine.selectedPeer.Put(2, group)
+		scatterer.ordinaryEngine.selectedPeer.Put(3, group)
+	}
+	for i := 0; i < 800; i++ {
+		scatterer.ordinaryEngine.selectedPeer.Put(5, group)
+	}
+	for i := 0; i < 400; i++ {
+		scatterer.ordinaryEngine.selectedPeer.Put(1, group)
+	}
+	// test region with peer 1 2 3
+	for i := uint64(1); i < 20; i++ {
+		region := tc.AddLeaderRegion(i+200, i%3+1, (i+1)%3+1, (i+2)%3+1)
+		op := scatterer.scatterRegion(region, group)
+		re.False(isPeerCountChanged(op))
+	}
+}
+
 // TestBalanceRegion tests whether region peers and leaders are balanced after scatter.
 // ref https://github.com/tikv/pd/issues/6017
 func TestBalanceRegion(t *testing.T) {