From bd9da84120aafc282c27ada222381a3f1ced5afe Mon Sep 17 00:00:00 2001 From: Ryan Leung Date: Tue, 13 Dec 2022 17:38:41 +0800 Subject: [PATCH] move member to pkg Signed-off-by: Ryan Leung --- {server => pkg}/member/member.go | 0 server/server.go | 2 +- server/tso/allocator_manager.go | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename {server => pkg}/member/member.go (100%) diff --git a/server/member/member.go b/pkg/member/member.go similarity index 100% rename from server/member/member.go rename to pkg/member/member.go diff --git a/server/server.go b/server/server.go index dbad4d85352..525b4b2357a 100644 --- a/server/server.go +++ b/server/server.go @@ -42,6 +42,7 @@ import ( "github.com/tikv/pd/pkg/audit" "github.com/tikv/pd/pkg/encryption" "github.com/tikv/pd/pkg/errs" + "github.com/tikv/pd/pkg/member" "github.com/tikv/pd/pkg/ratelimit" "github.com/tikv/pd/pkg/storage/kv" "github.com/tikv/pd/pkg/systimemon" @@ -58,7 +59,6 @@ import ( "github.com/tikv/pd/server/gc" "github.com/tikv/pd/server/id" "github.com/tikv/pd/server/keyspace" - "github.com/tikv/pd/server/member" syncer "github.com/tikv/pd/server/region_syncer" "github.com/tikv/pd/server/schedule" "github.com/tikv/pd/server/schedule/hbstream" diff --git a/server/tso/allocator_manager.go b/server/tso/allocator_manager.go index 6c673cb6b5a..2c0fa04524c 100644 --- a/server/tso/allocator_manager.go +++ b/server/tso/allocator_manager.go @@ -30,12 +30,12 @@ import ( "github.com/pingcap/log" "github.com/tikv/pd/pkg/election" "github.com/tikv/pd/pkg/errs" + "github.com/tikv/pd/pkg/member" "github.com/tikv/pd/pkg/slice" "github.com/tikv/pd/pkg/storage/kv" "github.com/tikv/pd/pkg/utils/etcdutil" "github.com/tikv/pd/pkg/utils/grpcutil" "github.com/tikv/pd/pkg/utils/syncutil" - "github.com/tikv/pd/server/member" "go.etcd.io/etcd/clientv3" "go.uber.org/zap" "google.golang.org/grpc"