Merge remote-tracking branch 'origin/master' into add-registry

Conflicts: server/server.go server/util.go
tikv · Dec 14, 2022 · b4df235 · b4df235
2 parents a1e1deb + 84c0f82
commit b4df235
Show file tree

Hide file tree

Showing 95 changed files with 98 additions and 97 deletions.
diff --git a/server/id/id.go → pkg/id/id.go b/server/id/id.go → pkg/id/id.go
diff --git a/server/id/id_test.go → pkg/id/id_test.go b/server/id/id_test.go → pkg/id/id_test.go
diff --git a/server/id/metrics.go → pkg/id/metrics.go b/server/id/metrics.go → pkg/id/metrics.go
diff --git a/server/member/member.go → pkg/member/member.go b/server/member/member.go → pkg/member/member.go
diff --git a/pkg/mock/mockcluster/mockcluster.go b/pkg/mock/mockcluster/mockcluster.go
@@ -25,18 +25,18 @@ import (
 	"github.com/pingcap/kvproto/pkg/pdpb"
 	"github.com/pingcap/log"
 	"github.com/tikv/pd/pkg/errs"
+	"github.com/tikv/pd/pkg/id"
 	"github.com/tikv/pd/pkg/mock/mockid"
 	"github.com/tikv/pd/pkg/utils/typeutil"
+	"github.com/tikv/pd/pkg/versioninfo"
 	"github.com/tikv/pd/server/config"
 	"github.com/tikv/pd/server/core"
 	"github.com/tikv/pd/server/core/storelimit"
-	"github.com/tikv/pd/server/id"
 	"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"
 	"github.com/tikv/pd/server/storage"
-	"github.com/tikv/pd/server/versioninfo"
 )
 
 const (

diff --git a/server/storage/endpoint/config.go → pkg/storage/endpoint/config.go b/server/storage/endpoint/config.go → pkg/storage/endpoint/config.go
diff --git a/server/storage/endpoint/endpoint.go → pkg/storage/endpoint/endpoint.go b/server/storage/endpoint/endpoint.go → pkg/storage/endpoint/endpoint.go
diff --git a/...er/storage/endpoint/external_timestamp.go → pkg/storage/endpoint/external_timestamp.go b/...er/storage/endpoint/external_timestamp.go → pkg/storage/endpoint/external_timestamp.go
diff --git a/server/storage/endpoint/gc_key_space.go → pkg/storage/endpoint/gc_key_space.go b/server/storage/endpoint/gc_key_space.go → pkg/storage/endpoint/gc_key_space.go
diff --git a/server/storage/endpoint/gc_safe_point.go → pkg/storage/endpoint/gc_safe_point.go b/server/storage/endpoint/gc_safe_point.go → pkg/storage/endpoint/gc_safe_point.go
diff --git a/server/storage/endpoint/key_path.go → pkg/storage/endpoint/key_path.go b/server/storage/endpoint/key_path.go → pkg/storage/endpoint/key_path.go
diff --git a/server/storage/endpoint/key_path_test.go → pkg/storage/endpoint/key_path_test.go b/server/storage/endpoint/key_path_test.go → pkg/storage/endpoint/key_path_test.go
diff --git a/server/storage/endpoint/keyspace.go → pkg/storage/endpoint/keyspace.go b/server/storage/endpoint/keyspace.go → pkg/storage/endpoint/keyspace.go
diff --git a/server/storage/endpoint/meta.go → pkg/storage/endpoint/meta.go b/server/storage/endpoint/meta.go → pkg/storage/endpoint/meta.go
diff --git a/server/storage/endpoint/min_resolved_ts.go → pkg/storage/endpoint/min_resolved_ts.go b/server/storage/endpoint/min_resolved_ts.go → pkg/storage/endpoint/min_resolved_ts.go
diff --git a/...er/storage/endpoint/replication_status.go → pkg/storage/endpoint/replication_status.go b/...er/storage/endpoint/replication_status.go → pkg/storage/endpoint/replication_status.go
diff --git a/server/storage/endpoint/rule.go → pkg/storage/endpoint/rule.go b/server/storage/endpoint/rule.go → pkg/storage/endpoint/rule.go
diff --git a/...er/storage/endpoint/service_middleware.go → pkg/storage/endpoint/service_middleware.go b/...er/storage/endpoint/service_middleware.go → pkg/storage/endpoint/service_middleware.go
diff --git a/server/storage/endpoint/util.go → pkg/storage/endpoint/util.go b/server/storage/endpoint/util.go → pkg/storage/endpoint/util.go
diff --git a/server/versioninfo/feature.go → pkg/versioninfo/feature.go b/server/versioninfo/feature.go → pkg/versioninfo/feature.go
diff --git a/server/versioninfo/versioninfo.go → pkg/versioninfo/versioninfo.go b/server/versioninfo/versioninfo.go → pkg/versioninfo/versioninfo.go
diff --git a/plugin/scheduler_example/evict_leader.go b/plugin/scheduler_example/evict_leader.go
@@ -23,6 +23,7 @@ import (
 	"github.com/pingcap/errors"
 	"github.com/pingcap/log"
 	"github.com/tikv/pd/pkg/errs"
+	"github.com/tikv/pd/pkg/storage/endpoint"
 	"github.com/tikv/pd/pkg/utils/apiutil"
 	"github.com/tikv/pd/pkg/utils/syncutil"
 	"github.com/tikv/pd/server/core"
@@ -31,7 +32,6 @@ import (
 	"github.com/tikv/pd/server/schedule/operator"
 	"github.com/tikv/pd/server/schedule/plan"
 	"github.com/tikv/pd/server/schedulers"
-	"github.com/tikv/pd/server/storage/endpoint"
 	"github.com/unrolled/render"
 )
 

diff --git a/server/api/config_test.go b/server/api/config_test.go
@@ -23,9 +23,9 @@ import (
 	"github.com/stretchr/testify/suite"
 	tu "github.com/tikv/pd/pkg/utils/testutil"
 	"github.com/tikv/pd/pkg/utils/typeutil"
+	"github.com/tikv/pd/pkg/versioninfo"
 	"github.com/tikv/pd/server"
 	"github.com/tikv/pd/server/config"
-	"github.com/tikv/pd/server/versioninfo"
 )
 
 type configTestSuite struct {

diff --git a/server/api/operator_test.go b/server/api/operator_test.go
@@ -32,12 +32,12 @@ import (
 	"github.com/tikv/pd/pkg/mock/mockhbstream"
 	"github.com/tikv/pd/pkg/utils/apiutil"
 	tu "github.com/tikv/pd/pkg/utils/testutil"
+	"github.com/tikv/pd/pkg/versioninfo"
 	"github.com/tikv/pd/server"
 	"github.com/tikv/pd/server/config"
 	"github.com/tikv/pd/server/core"
 	pdoperator "github.com/tikv/pd/server/schedule/operator"
 	"github.com/tikv/pd/server/schedule/placement"
-	"github.com/tikv/pd/server/versioninfo"
 )
 
 type operatorTestSuite struct {

diff --git a/server/api/pprof.go b/server/api/pprof.go
@@ -27,8 +27,8 @@ import (
 	"time"
 
 	"github.com/pingcap/log"
+	"github.com/tikv/pd/pkg/versioninfo"
 	"github.com/tikv/pd/server"
-	"github.com/tikv/pd/server/versioninfo"
 	"github.com/unrolled/render"
 	"go.uber.org/zap"
 )

diff --git a/server/api/service_gc_safepoint.go b/server/api/service_gc_safepoint.go
@@ -18,8 +18,8 @@ import (
 	"net/http"
 
 	"github.com/gorilla/mux"
+	"github.com/tikv/pd/pkg/storage/endpoint"
 	"github.com/tikv/pd/server"
-	"github.com/tikv/pd/server/storage/endpoint"
 	"github.com/unrolled/render"
 )
 

diff --git a/server/api/service_gc_safepoint_test.go b/server/api/service_gc_safepoint_test.go
@@ -22,9 +22,9 @@ import (
 
 	"github.com/pingcap/kvproto/pkg/metapb"
 	"github.com/stretchr/testify/suite"
+	"github.com/tikv/pd/pkg/storage/endpoint"
 	"github.com/tikv/pd/pkg/utils/apiutil"
 	"github.com/tikv/pd/server"
-	"github.com/tikv/pd/server/storage/endpoint"
 )
 
 type serviceGCSafepointTestSuite struct {

diff --git a/server/api/status.go b/server/api/status.go
@@ -17,8 +17,8 @@ package api
 import (
 	"net/http"
 
+	"github.com/tikv/pd/pkg/versioninfo"
 	"github.com/tikv/pd/server"
-	"github.com/tikv/pd/server/versioninfo"
 	"github.com/unrolled/render"
 )
 

diff --git a/server/api/status_test.go b/server/api/status_test.go
@@ -20,7 +20,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
-	"github.com/tikv/pd/server/versioninfo"
+	"github.com/tikv/pd/pkg/versioninfo"
 )
 
 func checkStatusResponse(re *require.Assertions, body []byte) {

diff --git a/server/api/version.go b/server/api/version.go
@@ -17,7 +17,7 @@ package api
 import (
 	"net/http"
 
-	"github.com/tikv/pd/server/versioninfo"
+	"github.com/tikv/pd/pkg/versioninfo"
 	"github.com/unrolled/render"
 )
 

diff --git a/server/cluster/cluster.go b/server/cluster/cluster.go
@@ -32,17 +32,19 @@ import (
 	"github.com/pingcap/kvproto/pkg/pdpb"
 	"github.com/pingcap/log"
 	"github.com/tikv/pd/pkg/errs"
+	"github.com/tikv/pd/pkg/id"
 	"github.com/tikv/pd/pkg/progress"
 	"github.com/tikv/pd/pkg/slice"
+	"github.com/tikv/pd/pkg/storage/endpoint"
 	"github.com/tikv/pd/pkg/utils/etcdutil"
 	"github.com/tikv/pd/pkg/utils/logutil"
 	"github.com/tikv/pd/pkg/utils/netutil"
 	"github.com/tikv/pd/pkg/utils/syncutil"
 	"github.com/tikv/pd/pkg/utils/typeutil"
+	"github.com/tikv/pd/pkg/versioninfo"
 	"github.com/tikv/pd/server/config"
 	"github.com/tikv/pd/server/core"
 	"github.com/tikv/pd/server/core/storelimit"
-	"github.com/tikv/pd/server/id"
 	syncer "github.com/tikv/pd/server/region_syncer"
 	"github.com/tikv/pd/server/replication"
 	"github.com/tikv/pd/server/schedule"
@@ -54,8 +56,6 @@ import (
 	"github.com/tikv/pd/server/statistics"
 	"github.com/tikv/pd/server/statistics/buckets"
 	"github.com/tikv/pd/server/storage"
-	"github.com/tikv/pd/server/storage/endpoint"
-	"github.com/tikv/pd/server/versioninfo"
 	"go.etcd.io/etcd/clientv3"
 	"go.uber.org/zap"
 )

diff --git a/server/cluster/cluster_test.go b/server/cluster/cluster_test.go
@@ -29,19 +29,19 @@ import (
 	"github.com/pingcap/kvproto/pkg/pdpb"
 	"github.com/stretchr/testify/require"
 	"github.com/tikv/pd/pkg/errs"
+	"github.com/tikv/pd/pkg/id"
 	"github.com/tikv/pd/pkg/mock/mockid"
 	"github.com/tikv/pd/pkg/progress"
+	"github.com/tikv/pd/pkg/versioninfo"
 	"github.com/tikv/pd/server/config"
 	"github.com/tikv/pd/server/core"
-	"github.com/tikv/pd/server/id"
 	"github.com/tikv/pd/server/schedule"
 	"github.com/tikv/pd/server/schedule/filter"
 	"github.com/tikv/pd/server/schedule/labeler"
 	"github.com/tikv/pd/server/schedule/placement"
 	"github.com/tikv/pd/server/schedulers"
 	"github.com/tikv/pd/server/statistics"
 	"github.com/tikv/pd/server/storage"
-	"github.com/tikv/pd/server/versioninfo"
 )
 
 func TestStoreHeartbeat(t *testing.T) {

diff --git a/server/cluster/cluster_worker.go b/server/cluster/cluster_worker.go
@@ -24,10 +24,10 @@ import (
 	"github.com/tikv/pd/pkg/errs"
 	"github.com/tikv/pd/pkg/utils/logutil"
 	"github.com/tikv/pd/pkg/utils/typeutil"
+	"github.com/tikv/pd/pkg/versioninfo"
 	"github.com/tikv/pd/server/core"
 	"github.com/tikv/pd/server/schedule"
 	"github.com/tikv/pd/server/statistics/buckets"
-	"github.com/tikv/pd/server/versioninfo"
 	"go.uber.org/zap"
 )
 

diff --git a/server/config/config.go b/server/config/config.go
@@ -34,8 +34,8 @@ import (
 	"github.com/tikv/pd/pkg/utils/metricutil"
 	"github.com/tikv/pd/pkg/utils/syncutil"
 	"github.com/tikv/pd/pkg/utils/typeutil"
+	"github.com/tikv/pd/pkg/versioninfo"
 	"github.com/tikv/pd/server/core/storelimit"
-	"github.com/tikv/pd/server/versioninfo"
 
 	"github.com/BurntSushi/toml"
 	"github.com/coreos/go-semver/semver"

diff --git a/server/config/persist_options.go b/server/config/persist_options.go
@@ -31,11 +31,11 @@ import (
 	"github.com/pingcap/log"
 	"github.com/tikv/pd/pkg/cache"
 	"github.com/tikv/pd/pkg/slice"
+	"github.com/tikv/pd/pkg/storage/endpoint"
 	"github.com/tikv/pd/pkg/utils/etcdutil"
 	"github.com/tikv/pd/pkg/utils/typeutil"
 	"github.com/tikv/pd/server/core"
 	"github.com/tikv/pd/server/core/storelimit"
-	"github.com/tikv/pd/server/storage/endpoint"
 	"go.etcd.io/etcd/clientv3"
 )
 

diff --git a/server/config/service_middleware_persist_options.go b/server/config/service_middleware_persist_options.go
@@ -19,7 +19,7 @@ import (
 	"sync/atomic"
 
 	"github.com/pingcap/failpoint"
-	"github.com/tikv/pd/server/storage/endpoint"
+	"github.com/tikv/pd/pkg/storage/endpoint"
 )
 
 // ServiceMiddlewarePersistOptions wraps all service middleware configurations that need to persist to storage and

diff --git a/server/core/region_test.go b/server/core/region_test.go
@@ -24,8 +24,8 @@ import (
 	"github.com/pingcap/kvproto/pkg/metapb"
 	"github.com/pingcap/kvproto/pkg/pdpb"
 	"github.com/stretchr/testify/require"
+	"github.com/tikv/pd/pkg/id"
 	"github.com/tikv/pd/pkg/mock/mockid"
-	"github.com/tikv/pd/server/id"
 )
 
 func TestNeedMerge(t *testing.T) {

diff --git a/server/gc/safepoint.go b/server/gc/safepoint.go
@@ -18,8 +18,8 @@ import (
 	"math"
 	"time"
 
+	"github.com/tikv/pd/pkg/storage/endpoint"
 	"github.com/tikv/pd/pkg/utils/syncutil"
-	"github.com/tikv/pd/server/storage/endpoint"
 )
 
 // SafePointManager is the manager for safePoint of GC and services.

diff --git a/server/gc/safepoint_test.go b/server/gc/safepoint_test.go
@@ -21,8 +21,8 @@ import (
 	"time"
 
 	"github.com/stretchr/testify/require"
+	"github.com/tikv/pd/pkg/storage/endpoint"
 	"github.com/tikv/pd/pkg/storage/kv"
-	"github.com/tikv/pd/server/storage/endpoint"
 )
 
 func newGCStorage() endpoint.GCSafePointStorage {

diff --git a/server/grpc_service.go b/server/grpc_service.go
@@ -28,15 +28,15 @@ import (
 	"github.com/pingcap/kvproto/pkg/pdpb"
 	"github.com/pingcap/log"
 	"github.com/tikv/pd/pkg/errs"
+	"github.com/tikv/pd/pkg/storage/endpoint"
 	"github.com/tikv/pd/pkg/storage/kv"
 	"github.com/tikv/pd/pkg/utils/grpcutil"
 	"github.com/tikv/pd/pkg/utils/logutil"
 	"github.com/tikv/pd/pkg/utils/tsoutil"
+	"github.com/tikv/pd/pkg/versioninfo"
 	"github.com/tikv/pd/server/cluster"
 	"github.com/tikv/pd/server/core"
-	"github.com/tikv/pd/server/storage/endpoint"
 	"github.com/tikv/pd/server/tso"
-	"github.com/tikv/pd/server/versioninfo"
 	"go.etcd.io/etcd/clientv3"
 	"go.uber.org/zap"
 	"google.golang.org/grpc"

diff --git a/server/keyspace/keyspace.go b/server/keyspace/keyspace.go
@@ -19,9 +19,9 @@ import (
 
 	"github.com/pingcap/errors"
 	"github.com/pingcap/kvproto/pkg/keyspacepb"
+	"github.com/tikv/pd/pkg/id"
+	"github.com/tikv/pd/pkg/storage/endpoint"
 	"github.com/tikv/pd/pkg/utils/syncutil"
-	"github.com/tikv/pd/server/id"
-	"github.com/tikv/pd/server/storage/endpoint"
 )
 
 const (

diff --git a/server/keyspace/keyspace_test.go b/server/keyspace/keyspace_test.go
@@ -25,8 +25,8 @@ import (
 	"github.com/pingcap/kvproto/pkg/keyspacepb"
 	"github.com/stretchr/testify/require"
 	"github.com/tikv/pd/pkg/mock/mockid"
+	"github.com/tikv/pd/pkg/storage/endpoint"
 	"github.com/tikv/pd/pkg/storage/kv"
-	"github.com/tikv/pd/server/storage/endpoint"
 )
 
 const (

diff --git a/server/keyspace_service.go b/server/keyspace_service.go
@@ -21,8 +21,8 @@ import (
 	"github.com/gogo/protobuf/proto"
 	"github.com/pingcap/kvproto/pkg/keyspacepb"
 	"github.com/pingcap/kvproto/pkg/pdpb"
+	"github.com/tikv/pd/pkg/storage/endpoint"
 	"github.com/tikv/pd/server/keyspace"
-	"github.com/tikv/pd/server/storage/endpoint"
 	"go.etcd.io/etcd/clientv3"
 )
 

diff --git a/server/replication/replication_mode.go b/server/replication/replication_mode.go
@@ -29,12 +29,12 @@ import (
 	"github.com/pingcap/log"
 	"github.com/tikv/pd/pkg/errs"
 	"github.com/tikv/pd/pkg/slice"
+	"github.com/tikv/pd/pkg/storage/endpoint"
 	"github.com/tikv/pd/pkg/utils/logutil"
 	"github.com/tikv/pd/pkg/utils/syncutil"
 	"github.com/tikv/pd/server/config"
 	"github.com/tikv/pd/server/core"
 	"github.com/tikv/pd/server/schedule"
-	"github.com/tikv/pd/server/storage/endpoint"
 	"go.uber.org/zap"
 )
 

diff --git a/server/schedule/checker/learner_checker_test.go b/server/schedule/checker/learner_checker_test.go
@@ -21,10 +21,10 @@ import (
 	"github.com/pingcap/kvproto/pkg/metapb"
 	"github.com/stretchr/testify/require"
 	"github.com/tikv/pd/pkg/mock/mockcluster"
+	"github.com/tikv/pd/pkg/versioninfo"
 	"github.com/tikv/pd/server/config"
 	"github.com/tikv/pd/server/core"
 	"github.com/tikv/pd/server/schedule/operator"
-	"github.com/tikv/pd/server/versioninfo"
 )
 
 func TestPromoteLearner(t *testing.T) {

diff --git a/server/schedule/checker/merge_checker_test.go b/server/schedule/checker/merge_checker_test.go
@@ -24,6 +24,7 @@ import (
 	"github.com/stretchr/testify/suite"
 	"github.com/tikv/pd/pkg/mock/mockcluster"
 	"github.com/tikv/pd/pkg/utils/testutil"
+	"github.com/tikv/pd/pkg/versioninfo"
 	"github.com/tikv/pd/server/config"
 	"github.com/tikv/pd/server/core"
 	"github.com/tikv/pd/server/core/storelimit"
@@ -32,7 +33,6 @@ import (
 	"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/server/versioninfo"
 	"go.uber.org/goleak"
 )
 

diff --git a/server/schedule/checker/replica_checker_test.go b/server/schedule/checker/replica_checker_test.go
@@ -26,10 +26,10 @@ import (
 	"github.com/tikv/pd/pkg/cache"
 	"github.com/tikv/pd/pkg/mock/mockcluster"
 	"github.com/tikv/pd/pkg/utils/testutil"
+	"github.com/tikv/pd/pkg/versioninfo"
 	"github.com/tikv/pd/server/config"
 	"github.com/tikv/pd/server/core"
 	"github.com/tikv/pd/server/schedule/operator"
-	"github.com/tikv/pd/server/versioninfo"
 )
 
 type replicaCheckerTestSuite struct {

diff --git a/server/schedule/checker/rule_checker.go b/server/schedule/checker/rule_checker.go
@@ -26,12 +26,12 @@ import (
 	"github.com/pingcap/log"
 	"github.com/tikv/pd/pkg/cache"
 	"github.com/tikv/pd/pkg/errs"
+	"github.com/tikv/pd/pkg/versioninfo"
 	"github.com/tikv/pd/server/core"
 	"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"
-	"github.com/tikv/pd/server/versioninfo"
 	"go.uber.org/zap"
 )
 

diff --git a/server/schedule/checker/rule_checker_test.go b/server/schedule/checker/rule_checker_test.go
@@ -28,11 +28,11 @@ import (
 	"github.com/tikv/pd/pkg/errs"
 	"github.com/tikv/pd/pkg/mock/mockcluster"
 	"github.com/tikv/pd/pkg/utils/testutil"
+	"github.com/tikv/pd/pkg/versioninfo"
 	"github.com/tikv/pd/server/config"
 	"github.com/tikv/pd/server/core"
 	"github.com/tikv/pd/server/schedule/operator"
 	"github.com/tikv/pd/server/schedule/placement"
-	"github.com/tikv/pd/server/versioninfo"
 )
 
 func TestRuleCheckerTestSuite(t *testing.T) {

diff --git a/server/schedule/labeler/labeler.go b/server/schedule/labeler/labeler.go
@@ -22,10 +22,10 @@ import (
 
 	"github.com/pingcap/log"
 	"github.com/tikv/pd/pkg/errs"
+	"github.com/tikv/pd/pkg/storage/endpoint"
 	"github.com/tikv/pd/pkg/utils/syncutil"
 	"github.com/tikv/pd/server/core"
 	"github.com/tikv/pd/server/schedule/rangelist"
-	"github.com/tikv/pd/server/storage/endpoint"
 	"go.uber.org/zap"
 )