*: move statistics, schedule from server to pkg (#6133)

ref #5839

Signed-off-by: HunDunDM <[email protected]>

.github/CODEOWNERS

@@ -1,5 +1,5 @@
 # Require review from domain experts when the PR modified significant config files.
 /server/config/config.go @tikv/pd-configuration-reviewer
-/server/schedule/schedulers/hot_region_config.go @tikv/pd-configuration-reviewer
+/pkg/schedule/schedulers/hot_region_config.go @tikv/pd-configuration-reviewer
 /conf/config.toml @tikv/pd-configuration-reviewer
 /metrics/grafana/pd.json @tikv/pd-configuration-reviewer

cmd/pd-server/main.go

@@ -28,6 +28,7 @@ import (
 	"github.com/tikv/pd/pkg/errs"
 	resource_manager "github.com/tikv/pd/pkg/mcs/resource_manager/server"
 	tso "github.com/tikv/pd/pkg/mcs/tso/server"
+	"github.com/tikv/pd/pkg/schedule/schedulers"
 	"github.com/tikv/pd/pkg/swaggerserver"
 	"github.com/tikv/pd/pkg/utils/configutil"
 	"github.com/tikv/pd/pkg/utils/logutil"
@@ -38,7 +39,6 @@ import (
 	"github.com/tikv/pd/server/apiv2"
 	"github.com/tikv/pd/server/config"
 	"github.com/tikv/pd/server/join"
-	"github.com/tikv/pd/server/schedule/schedulers"
 	"go.uber.org/zap"
 )
 

pkg/autoscaling/calculation.go

@@ -25,10 +25,10 @@ import (
 	promClient "github.com/prometheus/client_golang/api"
 	"github.com/tikv/pd/pkg/core"
 	"github.com/tikv/pd/pkg/errs"
+	"github.com/tikv/pd/pkg/schedule/filter"
 	"github.com/tikv/pd/pkg/utils/typeutil"
 	"github.com/tikv/pd/server/cluster"
 	"github.com/tikv/pd/server/config"
-	"github.com/tikv/pd/server/schedule/filter"
 	"go.etcd.io/etcd/clientv3"
 	"go.uber.org/zap"
 )

pkg/mock/mockcluster/config.go

@@ -17,9 +17,9 @@ package mockcluster
 import (
 	"time"
 
+	"github.com/tikv/pd/pkg/schedule/placement"
 	"github.com/tikv/pd/pkg/utils/typeutil"
 	"github.com/tikv/pd/server/config"
-	"github.com/tikv/pd/server/schedule/placement"
 )
 
 // SetMaxMergeRegionSize updates the MaxMergeRegionSize configuration.

pkg/mock/mockcluster/mockcluster.go

@@ -29,15 +29,15 @@ import (
 	"github.com/tikv/pd/pkg/errs"
 	"github.com/tikv/pd/pkg/id"
 	"github.com/tikv/pd/pkg/mock/mockid"
+	sc "github.com/tikv/pd/pkg/schedule/config"
+	"github.com/tikv/pd/pkg/schedule/labeler"
+	"github.com/tikv/pd/pkg/schedule/placement"
+	"github.com/tikv/pd/pkg/statistics"
+	"github.com/tikv/pd/pkg/statistics/buckets"
 	"github.com/tikv/pd/pkg/storage"
 	"github.com/tikv/pd/pkg/utils/typeutil"
 	"github.com/tikv/pd/pkg/versioninfo"
 	"github.com/tikv/pd/server/config"
-	sc "github.com/tikv/pd/server/schedule/config"
-	"github.com/tikv/pd/server/schedule/labeler"
-	"github.com/tikv/pd/server/schedule/placement"
-	"github.com/tikv/pd/server/statistics"
-	"github.com/tikv/pd/server/statistics/buckets"
 )
 
 const (

pkg/mock/mockconfig/mockconfig.go

@@ -15,8 +15,8 @@
 package mockconfig
 
 import (
+	sc "github.com/tikv/pd/pkg/schedule/config"
 	"github.com/tikv/pd/server/config"
-	sc "github.com/tikv/pd/server/schedule/config"
 )
 
 // NewTestOptions creates default options for testing.

pkg/mock/mockhbstream/mockhbstream.go

@@ -20,7 +20,7 @@ import (
 
 	"github.com/pingcap/kvproto/pkg/pdpb"
 	"github.com/tikv/pd/pkg/core"
-	"github.com/tikv/pd/server/schedule/hbstream"
+	"github.com/tikv/pd/pkg/schedule/hbstream"
 )
 
 // HeartbeatStream is used to mock HeartbeatStream for test use.

pkg/mock/mockhbstream/mockhbstream_test.go

@@ -25,9 +25,9 @@ import (
 	"github.com/tikv/pd/pkg/core"
 	"github.com/tikv/pd/pkg/mock/mockcluster"
 	"github.com/tikv/pd/pkg/mock/mockconfig"
+	"github.com/tikv/pd/pkg/schedule/hbstream"
 	"github.com/tikv/pd/pkg/utils/testutil"
 	"github.com/tikv/pd/pkg/utils/typeutil"
-	"github.com/tikv/pd/server/schedule/hbstream"
 )
 
 func TestActivity(t *testing.T) {

server/schedule/checker/checker_controller.go → pkg/schedule/checker/checker_controller.go

@@ -22,12 +22,12 @@ import (
 	"github.com/tikv/pd/pkg/cache"
 	"github.com/tikv/pd/pkg/core"
 	"github.com/tikv/pd/pkg/errs"
+	"github.com/tikv/pd/pkg/schedule"
+	"github.com/tikv/pd/pkg/schedule/config"
+	"github.com/tikv/pd/pkg/schedule/labeler"
+	"github.com/tikv/pd/pkg/schedule/operator"
+	"github.com/tikv/pd/pkg/schedule/placement"
 	"github.com/tikv/pd/pkg/utils/keyutil"
-	"github.com/tikv/pd/server/schedule"
-	"github.com/tikv/pd/server/schedule/config"
-	"github.com/tikv/pd/server/schedule/labeler"
-	"github.com/tikv/pd/server/schedule/operator"
-	"github.com/tikv/pd/server/schedule/placement"
 )
 
 // DefaultCacheSize is the default length of waiting list.

server/schedule/checker/joint_state_checker.go → pkg/schedule/checker/joint_state_checker.go

@@ -19,8 +19,8 @@ import (
 	"github.com/tikv/pd/pkg/core"
 	"github.com/tikv/pd/pkg/core/constant"
 	"github.com/tikv/pd/pkg/errs"
-	"github.com/tikv/pd/server/schedule"
-	"github.com/tikv/pd/server/schedule/operator"
+	"github.com/tikv/pd/pkg/schedule"
+	"github.com/tikv/pd/pkg/schedule/operator"
 )
 
 // JointStateChecker ensures region is in joint state will leave.

server/schedule/checker/joint_state_checker_test.go → pkg/schedule/checker/joint_state_checker_test.go

@@ -23,7 +23,7 @@ import (
 	"github.com/tikv/pd/pkg/core"
 	"github.com/tikv/pd/pkg/mock/mockcluster"
 	"github.com/tikv/pd/pkg/mock/mockconfig"
-	"github.com/tikv/pd/server/schedule/operator"
+	"github.com/tikv/pd/pkg/schedule/operator"
 )
 
 func TestLeaveJointState(t *testing.T) {

server/schedule/checker/learner_checker.go → pkg/schedule/checker/learner_checker.go

@@ -18,8 +18,8 @@ import (
 	"github.com/pingcap/log"
 	"github.com/tikv/pd/pkg/core"
 	"github.com/tikv/pd/pkg/errs"
-	"github.com/tikv/pd/server/schedule"
-	"github.com/tikv/pd/server/schedule/operator"
+	"github.com/tikv/pd/pkg/schedule"
+	"github.com/tikv/pd/pkg/schedule/operator"
 )
 
 // LearnerChecker ensures region has a learner will be promoted.

server/schedule/checker/learner_checker_test.go → pkg/schedule/checker/learner_checker_test.go

@@ -23,8 +23,8 @@ import (
 	"github.com/tikv/pd/pkg/core"
 	"github.com/tikv/pd/pkg/mock/mockcluster"
 	"github.com/tikv/pd/pkg/mock/mockconfig"
+	"github.com/tikv/pd/pkg/schedule/operator"
 	"github.com/tikv/pd/pkg/versioninfo"
-	"github.com/tikv/pd/server/schedule/operator"
 )
 
 func TestPromoteLearner(t *testing.T) {

server/schedule/checker/merge_checker.go → pkg/schedule/checker/merge_checker.go

@@ -25,13 +25,13 @@ import (
 	"github.com/tikv/pd/pkg/core"
 	"github.com/tikv/pd/pkg/core/constant"
 	"github.com/tikv/pd/pkg/errs"
+	"github.com/tikv/pd/pkg/schedule"
+	"github.com/tikv/pd/pkg/schedule/config"
+	"github.com/tikv/pd/pkg/schedule/filter"
+	"github.com/tikv/pd/pkg/schedule/labeler"
+	"github.com/tikv/pd/pkg/schedule/operator"
+	"github.com/tikv/pd/pkg/schedule/placement"
 	"github.com/tikv/pd/pkg/utils/logutil"
-	"github.com/tikv/pd/server/schedule"
-	"github.com/tikv/pd/server/schedule/config"
-	"github.com/tikv/pd/server/schedule/filter"
-	"github.com/tikv/pd/server/schedule/labeler"
-	"github.com/tikv/pd/server/schedule/operator"
-	"github.com/tikv/pd/server/schedule/placement"
 )
 
 const (

server/schedule/checker/merge_checker_test.go → pkg/schedule/checker/merge_checker_test.go

@@ -26,14 +26,14 @@ import (
 	"github.com/tikv/pd/pkg/core/storelimit"
 	"github.com/tikv/pd/pkg/mock/mockcluster"
 	"github.com/tikv/pd/pkg/mock/mockconfig"
+	"github.com/tikv/pd/pkg/schedule"
+	"github.com/tikv/pd/pkg/schedule/config"
+	"github.com/tikv/pd/pkg/schedule/hbstream"
+	"github.com/tikv/pd/pkg/schedule/labeler"
+	"github.com/tikv/pd/pkg/schedule/operator"
+	"github.com/tikv/pd/pkg/schedule/placement"
 	"github.com/tikv/pd/pkg/utils/testutil"
 	"github.com/tikv/pd/pkg/versioninfo"
-	"github.com/tikv/pd/server/schedule"
-	"github.com/tikv/pd/server/schedule/config"
-	"github.com/tikv/pd/server/schedule/hbstream"
-	"github.com/tikv/pd/server/schedule/labeler"
-	"github.com/tikv/pd/server/schedule/operator"
-	"github.com/tikv/pd/server/schedule/placement"
 	"go.uber.org/goleak"
 )
 

server/schedule/checker/priority_inspector.go → pkg/schedule/checker/priority_inspector.go

@@ -19,9 +19,9 @@ import (
 
 	"github.com/tikv/pd/pkg/cache"
 	"github.com/tikv/pd/pkg/core"
-	"github.com/tikv/pd/server/schedule"
-	"github.com/tikv/pd/server/schedule/config"
-	"github.com/tikv/pd/server/schedule/placement"
+	"github.com/tikv/pd/pkg/schedule"
+	"github.com/tikv/pd/pkg/schedule/config"
+	"github.com/tikv/pd/pkg/schedule/placement"
 )
 
 // the default value of priority queue size

server/schedule/checker/replica_checker.go → pkg/schedule/checker/replica_checker.go

@@ -23,9 +23,9 @@ import (
 	"github.com/tikv/pd/pkg/core"
 	"github.com/tikv/pd/pkg/core/constant"
 	"github.com/tikv/pd/pkg/errs"
-	"github.com/tikv/pd/server/schedule"
-	"github.com/tikv/pd/server/schedule/config"
-	"github.com/tikv/pd/server/schedule/operator"
+	"github.com/tikv/pd/pkg/schedule"
+	"github.com/tikv/pd/pkg/schedule/config"
+	"github.com/tikv/pd/pkg/schedule/operator"
 	"go.uber.org/zap"
 )
 

server/schedule/checker/replica_checker_test.go → pkg/schedule/checker/replica_checker_test.go

@@ -27,10 +27,10 @@ import (
 	"github.com/tikv/pd/pkg/core"
 	"github.com/tikv/pd/pkg/mock/mockcluster"
 	"github.com/tikv/pd/pkg/mock/mockconfig"
+	"github.com/tikv/pd/pkg/schedule/config"
+	"github.com/tikv/pd/pkg/schedule/operator"
 	"github.com/tikv/pd/pkg/utils/testutil"
 	"github.com/tikv/pd/pkg/versioninfo"
-	"github.com/tikv/pd/server/schedule/config"
-	"github.com/tikv/pd/server/schedule/operator"
 )
 
 type replicaCheckerTestSuite struct {

server/schedule/checker/replica_strategy.go → pkg/schedule/checker/replica_strategy.go

@@ -17,8 +17,8 @@ package checker
 import (
 	"github.com/pingcap/log"
 	"github.com/tikv/pd/pkg/core"
-	"github.com/tikv/pd/server/schedule"
-	"github.com/tikv/pd/server/schedule/filter"
+	"github.com/tikv/pd/pkg/schedule"
+	"github.com/tikv/pd/pkg/schedule/filter"
 	"go.uber.org/zap"
 )
 

server/schedule/checker/rule_checker.go → pkg/schedule/checker/rule_checker.go

@@ -27,11 +27,11 @@ import (
 	"github.com/tikv/pd/pkg/core"
 	"github.com/tikv/pd/pkg/core/constant"
 	"github.com/tikv/pd/pkg/errs"
+	"github.com/tikv/pd/pkg/schedule"
+	"github.com/tikv/pd/pkg/schedule/filter"
+	"github.com/tikv/pd/pkg/schedule/operator"
+	"github.com/tikv/pd/pkg/schedule/placement"
 	"github.com/tikv/pd/pkg/versioninfo"
-	"github.com/tikv/pd/server/schedule"
-	"github.com/tikv/pd/server/schedule/filter"
-	"github.com/tikv/pd/server/schedule/operator"
-	"github.com/tikv/pd/server/schedule/placement"
 	"go.uber.org/zap"
 )
 

server/schedule/checker/rule_checker_test.go → pkg/schedule/checker/rule_checker_test.go

@@ -30,10 +30,10 @@ import (
 	"github.com/tikv/pd/pkg/errs"
 	"github.com/tikv/pd/pkg/mock/mockcluster"
 	"github.com/tikv/pd/pkg/mock/mockconfig"
+	"github.com/tikv/pd/pkg/schedule/operator"
+	"github.com/tikv/pd/pkg/schedule/placement"
 	"github.com/tikv/pd/pkg/utils/testutil"
 	"github.com/tikv/pd/pkg/versioninfo"
-	"github.com/tikv/pd/server/schedule/operator"
-	"github.com/tikv/pd/server/schedule/placement"
 )
 
 func TestRuleCheckerTestSuite(t *testing.T) {
@@ -1196,13 +1196,13 @@ func (suite *ruleCheckerTestSuite) TestRuleCache() {
 	for _, testCase := range testCases {
 		suite.T().Log(testCase.name)
 		if testCase.stillCached {
-			suite.NoError(failpoint.Enable("github.com/tikv/pd/server/schedule/checker/assertShouldCache", "return(true)"))
+			suite.NoError(failpoint.Enable("github.com/tikv/pd/pkg/schedule/checker/assertShouldCache", "return(true)"))
 			suite.rc.Check(testCase.region)
-			suite.NoError(failpoint.Disable("github.com/tikv/pd/server/schedule/checker/assertShouldCache"))
+			suite.NoError(failpoint.Disable("github.com/tikv/pd/pkg/schedule/checker/assertShouldCache"))
 		} else {
-			suite.NoError(failpoint.Enable("github.com/tikv/pd/server/schedule/checker/assertShouldNotCache", "return(true)"))
+			suite.NoError(failpoint.Enable("github.com/tikv/pd/pkg/schedule/checker/assertShouldNotCache", "return(true)"))
 			suite.rc.Check(testCase.region)
-			suite.NoError(failpoint.Disable("github.com/tikv/pd/server/schedule/checker/assertShouldNotCache"))
+			suite.NoError(failpoint.Disable("github.com/tikv/pd/pkg/schedule/checker/assertShouldNotCache"))
 		}
 	}
 }

server/schedule/checker/split_checker.go → pkg/schedule/checker/split_checker.go

@@ -19,10 +19,10 @@ import (
 	"github.com/pingcap/log"
 	"github.com/tikv/pd/pkg/core"
 	"github.com/tikv/pd/pkg/errs"
-	"github.com/tikv/pd/server/schedule"
-	"github.com/tikv/pd/server/schedule/labeler"
-	"github.com/tikv/pd/server/schedule/operator"
-	"github.com/tikv/pd/server/schedule/placement"
+	"github.com/tikv/pd/pkg/schedule"
+	"github.com/tikv/pd/pkg/schedule/labeler"
+	"github.com/tikv/pd/pkg/schedule/operator"
+	"github.com/tikv/pd/pkg/schedule/placement"
 )
 
 // SplitChecker splits regions when the key range spans across rule/label boundary.

server/schedule/checker/split_checker_test.go → pkg/schedule/checker/split_checker_test.go

@@ -22,9 +22,9 @@ import (
 	"github.com/stretchr/testify/require"
 	"github.com/tikv/pd/pkg/mock/mockcluster"
 	"github.com/tikv/pd/pkg/mock/mockconfig"
-	"github.com/tikv/pd/server/schedule/labeler"
-	"github.com/tikv/pd/server/schedule/operator"
-	"github.com/tikv/pd/server/schedule/placement"
+	"github.com/tikv/pd/pkg/schedule/labeler"
+	"github.com/tikv/pd/pkg/schedule/operator"
+	"github.com/tikv/pd/pkg/schedule/placement"
 )
 
 func TestSplit(t *testing.T) {

server/schedule/cluster.go → pkg/schedule/cluster.go

@@ -16,9 +16,9 @@ package schedule
 
 import (
 	"github.com/tikv/pd/pkg/core"
-	"github.com/tikv/pd/server/schedule/operator"
-	"github.com/tikv/pd/server/statistics"
-	"github.com/tikv/pd/server/statistics/buckets"
+	"github.com/tikv/pd/pkg/schedule/operator"
+	"github.com/tikv/pd/pkg/statistics"
+	"github.com/tikv/pd/pkg/statistics/buckets"
 )
 
 // Cluster provides an overview of a cluster's regions distribution.

server/schedule/filter/candidates.go → pkg/schedule/filter/candidates.go

@@ -19,8 +19,8 @@ import (
 	"sort"
 
 	"github.com/tikv/pd/pkg/core"
-	"github.com/tikv/pd/server/schedule/config"
-	"github.com/tikv/pd/server/schedule/plan"
+	"github.com/tikv/pd/pkg/schedule/config"
+	"github.com/tikv/pd/pkg/schedule/plan"
 )
 
 // StoreCandidates wraps store list and provide utilities to select source or

server/schedule/filter/candidates_test.go → pkg/schedule/filter/candidates_test.go

@@ -20,8 +20,8 @@ import (
 	"github.com/pingcap/kvproto/pkg/metapb"
 	"github.com/stretchr/testify/require"
 	"github.com/tikv/pd/pkg/core"
-	"github.com/tikv/pd/server/schedule/config"
-	"github.com/tikv/pd/server/schedule/plan"
+	"github.com/tikv/pd/pkg/schedule/config"
+	"github.com/tikv/pd/pkg/schedule/plan"
 )
 
 // A dummy comparer for testing.

server/schedule/filter/comparer.go → pkg/schedule/filter/comparer.go

@@ -16,7 +16,7 @@ package filter
 
 import (
 	"github.com/tikv/pd/pkg/core"
-	"github.com/tikv/pd/server/schedule/config"
+	"github.com/tikv/pd/pkg/schedule/config"
 )
 
 // StoreComparer compares 2 stores. Often used for StoreCandidates to

server/schedule/filter/filters.go → pkg/schedule/filter/filters.go

@@ -21,11 +21,11 @@ import (
 	"github.com/pingcap/log"
 	"github.com/tikv/pd/pkg/core"
 	"github.com/tikv/pd/pkg/core/storelimit"
+	"github.com/tikv/pd/pkg/schedule/config"
+	"github.com/tikv/pd/pkg/schedule/placement"
+	"github.com/tikv/pd/pkg/schedule/plan"
 	"github.com/tikv/pd/pkg/slice"
 	"github.com/tikv/pd/pkg/utils/typeutil"
-	"github.com/tikv/pd/server/schedule/config"
-	"github.com/tikv/pd/server/schedule/placement"
-	"github.com/tikv/pd/server/schedule/plan"
 	"go.uber.org/zap"
 )
 

server/schedule/filter/filters_test.go → pkg/schedule/filter/filters_test.go

@@ -25,8 +25,8 @@ import (
 	"github.com/tikv/pd/pkg/core"
 	"github.com/tikv/pd/pkg/mock/mockcluster"
 	"github.com/tikv/pd/pkg/mock/mockconfig"
-	"github.com/tikv/pd/server/schedule/placement"
-	"github.com/tikv/pd/server/schedule/plan"
+	"github.com/tikv/pd/pkg/schedule/placement"
+	"github.com/tikv/pd/pkg/schedule/plan"
 )
 
 func TestDistinctScoreFilter(t *testing.T) {