fix

Signed-off-by: Ryan Leung <[email protected]>

pkg/syncer/client.go

@@ -217,17 +217,7 @@ func (s *RegionSyncer) StartSyncWithLeader(addr string) {
 						log.Debug("region is stale", zap.Stringer("origin", origin.GetMeta()), errs.ZapError(err))
 						continue
 					}
-<<<<<<< HEAD
 					saveKV, _, _ := regionGuide(region, origin)
-=======
-					cctx := &core.MetaProcessContext{
-						Context:    ctx,
-						TaskRunner: ratelimit.NewSyncRunner(),
-						Tracer:     core.NewNoopHeartbeatProcessTracer(),
-						// no limit for followers.
-					}
-					saveKV, _, _, _ := regionGuide(cctx, region, origin)
->>>>>>> 41ec8dced (syncer: exit watch leader immediately (#8824))
 					overlaps := bc.PutRegion(region)
 
 					if hasBuckets {

tests/integrations/client/client_test.go

@@ -228,11 +228,11 @@ func TestLeaderTransferAndMoveCluster(t *testing.T) {
 	oldServers := cluster.GetServers()
 	oldLeaderName := cluster.WaitLeader()
 	for i := 0; i < 3; i++ {
+		time.Sleep(5 * time.Second)
 		newPD, err := cluster.Join(ctx)
 		re.NoError(err)
 		re.NoError(newPD.Run())
 		oldLeaderName = cluster.WaitLeader()
-		time.Sleep(5 * time.Second)
 	}
 
 	// ABCDEF->DEF