move place

Signed-off-by: okJiang <[email protected]>
tikv · Sep 11, 2024 · 402102c · 402102c
1 parent b8f2c9e
commit 402102c
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 8 deletions.
diff --git a/pkg/mcs/utils/util.go b/pkg/mcs/utils/util.go
@@ -31,9 +31,9 @@ import (
 	"github.com/prometheus/client_golang/prometheus/promhttp"
 	"github.com/soheilhy/cmux"
 	"github.com/tikv/pd/pkg/errs"
-	"github.com/tikv/pd/pkg/global"
 	"github.com/tikv/pd/pkg/mcs/discovery"
 	"github.com/tikv/pd/pkg/mcs/utils/constant"
+	"github.com/tikv/pd/pkg/storage/endpoint"
 	"github.com/tikv/pd/pkg/utils/apiutil"
 	"github.com/tikv/pd/pkg/utils/apiutil/multiservicesapi"
 	"github.com/tikv/pd/pkg/utils/etcdutil"
@@ -53,7 +53,7 @@ func InitClusterID(ctx context.Context, client *clientv3.Client) (id uint64, err
 	defer ticker.Stop()
 	retryTimes := 0
 	for {
-		if clusterID, err := global.GetClusterIDFromEtcd(client); err == nil && clusterID != 0 {
+		if clusterID, err := endpoint.GetClusterIDFromEtcd(client); err == nil && clusterID != 0 {
 			return clusterID, nil
 		}
 		select {

diff --git a/pkg/global/cluster_id.go → pkg/storage/endpoint/cluster_id.go b/pkg/global/cluster_id.go → pkg/storage/endpoint/cluster_id.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package global
+package endpoint
 
 import (
 	"context"

diff --git a/pkg/global/cluster_id_test.go → pkg/storage/endpoint/cluster_id_test.go b/pkg/global/cluster_id_test.go → pkg/storage/endpoint/cluster_id_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package global
+package endpoint
 
 import (
 	"testing"

diff --git a/pkg/tso/keyspace_group_manager_test.go b/pkg/tso/keyspace_group_manager_test.go
@@ -31,7 +31,6 @@ import (
 	"github.com/pingcap/failpoint"
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
-	"github.com/tikv/pd/pkg/global"
 	"github.com/tikv/pd/pkg/mcs/discovery"
 	"github.com/tikv/pd/pkg/mcs/utils/constant"
 	"github.com/tikv/pd/pkg/storage/endpoint"
@@ -1047,7 +1046,7 @@ func (suite *keyspaceGroupManagerTestSuite) TestPrimaryPriorityChange() {
 
 	var err error
 	defaultPriority := constant.DefaultKeyspaceGroupReplicaPriority
-	clusterID, err := global.InitClusterID(suite.etcdClient)
+	clusterID, err := endpoint.InitClusterID(suite.etcdClient)
 	re.NoError(err)
 	clusterIDStr := strconv.FormatUint(clusterID, 10)
 	rootPath := path.Join("/pd", clusterIDStr)

diff --git a/server/server.go b/server/server.go
@@ -49,7 +49,6 @@ import (
 	"github.com/tikv/pd/pkg/encryption"
 	"github.com/tikv/pd/pkg/errs"
 	"github.com/tikv/pd/pkg/gc"
-	"github.com/tikv/pd/pkg/global"
 	"github.com/tikv/pd/pkg/id"
 	"github.com/tikv/pd/pkg/keyspace"
 	ms_server "github.com/tikv/pd/pkg/mcs/metastorage/server"
@@ -65,6 +64,7 @@ import (
 	"github.com/tikv/pd/pkg/schedule/hbstream"
 	"github.com/tikv/pd/pkg/schedule/placement"
 	"github.com/tikv/pd/pkg/storage"
+	"github.com/tikv/pd/pkg/storage/endpoint"
 	"github.com/tikv/pd/pkg/storage/kv"
 	"github.com/tikv/pd/pkg/syncer"
 	"github.com/tikv/pd/pkg/systimemon"
@@ -426,7 +426,7 @@ func (s *Server) AddStartCallback(callbacks ...func()) {
 }
 
 func (s *Server) startServer(ctx context.Context) error {
-	clusterID, err := global.InitClusterID(s.client)
+	clusterID, err := endpoint.InitClusterID(s.client)
 	if err != nil {
 		log.Error("failed to init cluster id", errs.ZapError(err))
 		return err