resolve conflicts

Signed-off-by: Ryan Leung <rleungx@gmail.com>

Author: rleungx

pkg/mcs/scheduling/server/server.go

@@ -16,7 +16,6 @@ package server
 
 import (
 	"context"
-	"fmt"
 	"net/http"
 	"os"
 	"os/signal"
@@ -223,7 +222,7 @@ func (s *Server) updatePDMemberLoop() {
 				}
 				if s.cluster.SwitchPDLeader(pdpb.NewPDClient(cc)) {
 					if status.Leader != curLeader {
-						log.Info("switch PD leader", zap.String("current-leader", fmt.Sprintf("%x", curLeader)), zap.String("new-leader-id", fmt.Sprintf("%x", ep.ID)), zap.String("endpoint", ep.ClientURLs[0]))
+						log.Info("switch PD leader", zap.String("current-leader", strconv.FormatUint(curLeader, 16)), zap.String("new-leader-id", strconv.FormatUint(ep.ID, 16)), zap.String("endpoint", ep.ClientURLs[0]))
 					}
 					curLeader = ep.ID
 					break

pkg/schedule/checker/checker_controller.go

@@ -35,6 +35,7 @@ import (
 	sche "github.com/tikv/pd/pkg/schedule/core"
 	"github.com/tikv/pd/pkg/schedule/labeler"
 	"github.com/tikv/pd/pkg/schedule/operator"
+	"github.com/tikv/pd/pkg/schedule/preparecheck"
 	"github.com/tikv/pd/pkg/utils/keyutil"
 	"github.com/tikv/pd/pkg/utils/logutil"
 )
@@ -92,12 +93,12 @@ type Controller struct {
 	// patrolRegionScanLimit is the limit of regions to scan.
 	// It is calculated by the number of regions.
 	patrolRegionScanLimit int
-	prepareChecker        *sche.PrepareChecker
+	prepareChecker        *preparecheck.Checker
 	metrics               *checkerControllerMetrics
 }
 
 // NewController create a new Controller.
-func NewController(ctx context.Context, cluster sche.CheckerCluster, opController *operator.Controller, prepareChecker *sche.PrepareChecker) *Controller {
+func NewController(ctx context.Context, cluster sche.CheckerCluster, opController *operator.Controller, prepareChecker *preparecheck.Checker) *Controller {
 	pendingProcessedRegions := cache.NewIDTTL(ctx, time.Minute, 3*time.Minute)
 	conf := cluster.GetCheckerConfig()
 	ruleManager := cluster.GetRuleManager()

pkg/schedule/coordinator.go

@@ -34,6 +34,7 @@ import (
 	"github.com/tikv/pd/pkg/schedule/diagnostic"
 	"github.com/tikv/pd/pkg/schedule/hbstream"
 	"github.com/tikv/pd/pkg/schedule/operator"
+	"github.com/tikv/pd/pkg/schedule/preparecheck"
 	"github.com/tikv/pd/pkg/schedule/scatter"
 	"github.com/tikv/pd/pkg/schedule/schedulers"
 	"github.com/tikv/pd/pkg/schedule/splitter"
@@ -46,9 +47,7 @@ import (
 
 const (
 	runSchedulerCheckInterval = 3 * time.Second
-	// collectTimeout is the timeout for collecting regions.
-	collectTimeout       = 5 * time.Minute
-	maxLoadConfigRetries = 10
+	maxLoadConfigRetries      = 10
 	// pushOperatorTickInterval is the interval try to push the operator.
 	pushOperatorTickInterval = 500 * time.Millisecond
 
@@ -69,7 +68,7 @@ type Coordinator struct {
 	schedulersInitialized bool
 
 	cluster           sche.ClusterInformer
-	prepareChecker    *prepareChecker
+	prepareChecker    *preparecheck.Checker
 	checkers          *checker.Controller
 	regionScatterer   *scatter.RegionScatterer
 	regionSplitter    *splitter.RegionSplitter
@@ -83,7 +82,7 @@ type Coordinator struct {
 // NewCoordinator creates a new Coordinator.
 func NewCoordinator(parentCtx context.Context, cluster sche.ClusterInformer, hbStreams *hbstream.HeartbeatStreams) *Coordinator {
 	ctx, cancel := context.WithCancel(parentCtx)
-	prepareChecker := newPrepareChecker(cluster.GetPrepareRegionCount)
+	prepareChecker := preparecheck.NewChecker(cluster.GetPrepareRegionCount)
 	opController := operator.NewController(ctx, cluster.GetBasicCluster(), cluster.GetSharedConfig(), hbStreams)
 	schedulers := schedulers.NewController(ctx, cluster, cluster.GetStorage(), opController, prepareChecker)
 	checkers := checker.NewController(ctx, cluster, opController, prepareChecker)
@@ -641,7 +640,7 @@ func (c *Coordinator) GetRuleChecker() *checker.RuleChecker {
 }
 
 // GetPrepareChecker returns the prepare checker.
-func (c *Coordinator) GetPrepareChecker() *prepareChecker {
+func (c *Coordinator) GetPrepareChecker() *preparecheck.Checker {
 	return c.prepareChecker
 }
 

pkg/schedule/prepare_checker.go …schedule/preparecheck/prepare_checker.gopkg/schedule/prepare_checker.go renamed to pkg/schedule/preparecheck/prepare_checker.go pkg/schedule/prepare_checker.go renamed to pkg/schedule/preparecheck/prepare_checker.go

@@ -1,4 +1,4 @@
-// Copyright 2022 TiKV Project Authors.
+// Copyright 2025 TiKV Project Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package schedule
+package preparecheck
 
 import (
 	"time"
@@ -25,23 +25,27 @@ import (
 	"github.com/tikv/pd/pkg/utils/syncutil"
 )
 
-// prepareChecker is used to check if the coordinator has finished cluster information preparation.
-type prepareChecker struct {
+// collectTimeout is the timeout for collecting regions.
+const collectTimeout = 5 * time.Minute
+
+// Checker is used to check if the coordinator has finished cluster information preparation.
+type Checker struct {
 	syncutil.RWMutex
 	start              time.Time
 	totalRegionCountFn func() (int, error)
 	prepared           bool
 }
 
-func newPrepareChecker(totalRegionCountFn func() (int, error)) *prepareChecker {
-	return &prepareChecker{
+// NewChecker creates a new Checker.
+func NewChecker(totalRegionCountFn func() (int, error)) *Checker {
+	return &Checker{
 		start:              time.Now(),
 		totalRegionCountFn: totalRegionCountFn,
 	}
 }
 
-// Before starting up the scheduler, we need to take the proportion of the regions on each store into consideration.
-func (checker *prepareChecker) Check(c *core.BasicCluster) bool {
+// Check is used to check if the coordinator has finished cluster information preparation.
+func (checker *Checker) Check(c *core.BasicCluster) bool {
 	checker.Lock()
 	defer checker.Unlock()
 	if checker.prepared {
@@ -79,7 +83,7 @@ func (checker *prepareChecker) Check(c *core.BasicCluster) bool {
 }
 
 // IsPrepared returns whether the coordinator is prepared.
-func (checker *prepareChecker) IsPrepared() bool {
+func (checker *Checker) IsPrepared() bool {
 	if checker == nil {
 		return false
 	}
@@ -89,14 +93,14 @@ func (checker *prepareChecker) IsPrepared() bool {
 }
 
 // SetPrepared is for test purpose
-func (checker *prepareChecker) SetPrepared() {
+func (checker *Checker) SetPrepared() {
 	checker.Lock()
 	defer checker.Unlock()
 	checker.prepared = true
 }
 
 // ResetPrepared is for test purpose
-func (checker *prepareChecker) ResetPrepared() {
+func (checker *Checker) ResetPrepared() {
 	checker.Lock()
 	defer checker.Unlock()
 	checker.prepared = false

pkg/schedule/schedulers/scheduler_controller.go

@@ -31,6 +31,7 @@ import (
 	"github.com/tikv/pd/pkg/schedule/labeler"
 	"github.com/tikv/pd/pkg/schedule/operator"
 	"github.com/tikv/pd/pkg/schedule/plan"
+	"github.com/tikv/pd/pkg/schedule/preparecheck"
 	"github.com/tikv/pd/pkg/schedule/types"
 	"github.com/tikv/pd/pkg/storage/endpoint"
 	"github.com/tikv/pd/pkg/utils/logutil"
@@ -57,11 +58,11 @@ type Controller struct {
 	// which will only be initialized and used in the microservice env now.
 	schedulerHandlers map[string]http.Handler
 	opController      *operator.Controller
-	prepareChecker    *sche.PrepareChecker
+	prepareChecker    *preparecheck.Checker
 }
 
 // NewController creates a scheduler controller.
-func NewController(ctx context.Context, cluster sche.SchedulerCluster, storage endpoint.ConfigStorage, opController *operator.Controller, prepareChecker *sche.PrepareChecker) *Controller {
+func NewController(ctx context.Context, cluster sche.SchedulerCluster, storage endpoint.ConfigStorage, opController *operator.Controller, prepareChecker *preparecheck.Checker) *Controller {
 	return &Controller{
 		ctx:               ctx,
 		cluster:           cluster,

tests/server/api/api_test.go

@@ -1335,7 +1335,8 @@ func TestDeleteAllRegionCacheScheduling(t *testing.T) {
 	testutil.Eventually(re, func() bool {
 		return rc.GetCoordinator() != nil
 	})
-	rc.HandleRegionHeartbeat(regionInfo)
+	err = rc.HandleRegionHeartbeat(regionInfo)
+	re.NoError(err)
 	testutil.Eventually(re, func() bool {
 		return rc.GetCoordinator().GetPrepareChecker().IsPrepared()
 	})
@@ -1353,7 +1354,8 @@ func TestDeleteAllRegionCacheScheduling(t *testing.T) {
 	re.Equal(0, int(rc.GetOperatorController().OperatorCount(operator.OpSplit)))
 
 	// Simulate continuous heartbeat and verify scheduling recovery
-	rc.HandleRegionHeartbeat(regionInfo)
+	err = rc.HandleRegionHeartbeat(regionInfo)
+	re.NoError(err)
 
 	testutil.Eventually(re, func() bool {
 		count := rc.GetOperatorController().OperatorCount(operator.OpSplit)

tests/server/cluster/cluster_test.go

@@ -2064,6 +2064,8 @@ func TestPatrolRegionConfigChange(t *testing.T) {
 		endKey := []byte(strconv.Itoa(i * 2))
 		tests.MustPutRegion(re, tc, uint64(i), uint64(i%3+1), startKey, endKey)
 	}
+	fname := testutil.InitTempFileLogger("debug")
+	defer os.RemoveAll(fname)
 	checkLog(re, fname, "coordinator starts patrol regions")
 
 	// test change patrol region interval