*: aggregate the utils package within the client

client/client.go

@@ -33,8 +33,8 @@ import (
 	"github.com/pingcap/log"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/tikv/pd/client/errs"
-	"github.com/tikv/pd/client/tlsutil"
-	"github.com/tikv/pd/client/tsoutil"
+	"github.com/tikv/pd/client/utils/tlsutil"
+	"github.com/tikv/pd/client/utils/tsoutil"
 	"go.uber.org/zap"
 )
 

client/client_test.go

@@ -22,8 +22,8 @@ import (
 	"github.com/pingcap/errors"
 	"github.com/pingcap/kvproto/pkg/pdpb"
 	"github.com/stretchr/testify/require"
-	"github.com/tikv/pd/client/testutil"
-	"github.com/tikv/pd/client/tsoutil"
+	"github.com/tikv/pd/client/utils/testutil"
+	"github.com/tikv/pd/client/utils/tsoutil"
 	"go.uber.org/goleak"
 	"google.golang.org/grpc"
 )

client/meta_storage_client.go

@@ -24,7 +24,7 @@ import (
 	"github.com/pingcap/kvproto/pkg/meta_storagepb"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/tikv/pd/client/errs"
-	"github.com/tikv/pd/client/grpcutil"
+	"github.com/tikv/pd/client/utils/grpcutil"
 )
 
 // MetaStorageClient is the interface for meta storage client.

client/option_test.go

@@ -19,7 +19,7 @@ import (
 	"time"
 
 	"github.com/stretchr/testify/require"
-	"github.com/tikv/pd/client/testutil"
+	"github.com/tikv/pd/client/utils/testutil"
 )
 
 func TestDynamicOptionChange(t *testing.T) {

client/pd_service_discovery.go

@@ -30,8 +30,8 @@ import (
 	"github.com/pingcap/kvproto/pkg/pdpb"
 	"github.com/pingcap/log"
 	"github.com/tikv/pd/client/errs"
-	"github.com/tikv/pd/client/grpcutil"
 	"github.com/tikv/pd/client/retry"
+	"github.com/tikv/pd/client/utils/grpcutil"
 	"go.uber.org/zap"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"

client/pd_service_discovery_test.go

@@ -30,8 +30,8 @@ import (
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
 	"github.com/tikv/pd/client/errs"
-	"github.com/tikv/pd/client/grpcutil"
-	"github.com/tikv/pd/client/testutil"
+	"github.com/tikv/pd/client/utils/grpcutil"
+	"github.com/tikv/pd/client/utils/testutil"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials/insecure"
 	pb "google.golang.org/grpc/examples/helloworld/helloworld"

client/tso_client.go

@@ -26,7 +26,7 @@ import (
 	"github.com/pingcap/failpoint"
 	"github.com/pingcap/log"
 	"github.com/tikv/pd/client/errs"
-	"github.com/tikv/pd/client/grpcutil"
+	"github.com/tikv/pd/client/utils/grpcutil"
 	"go.uber.org/zap"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"

client/tso_dispatcher.go

@@ -30,8 +30,8 @@ import (
 	"github.com/pingcap/log"
 	"github.com/tikv/pd/client/errs"
 	"github.com/tikv/pd/client/retry"
-	"github.com/tikv/pd/client/timerpool"
-	"github.com/tikv/pd/client/tsoutil"
+	"github.com/tikv/pd/client/utils/timerutil"
+	"github.com/tikv/pd/client/utils/tsoutil"
 	"go.uber.org/zap"
 )
 
@@ -48,7 +48,7 @@ func newTSDeadline(
 	done chan struct{},
 	cancel context.CancelFunc,
 ) *deadline {
-	timer := timerpool.GlobalTimerPool.Get(timeout)
+	timer := timerutil.GlobalTimerPool.Get(timeout)
 	return &deadline{
 		timer:  timer,
 		done:   done,
@@ -151,11 +151,11 @@ func (td *tsoDispatcher) watchTSDeadline() {
 				log.Error("[tso] tso request is canceled due to timeout",
 					zap.String("dc-location", td.dc), errs.ZapError(errs.ErrClientGetTSOTimeout))
 				d.cancel()
-				timerpool.GlobalTimerPool.Put(d.timer)
+				timerutil.GlobalTimerPool.Put(d.timer)
 			case <-d.done:
-				timerpool.GlobalTimerPool.Put(d.timer)
+				timerutil.GlobalTimerPool.Put(d.timer)
 			case <-td.ctx.Done():
-				timerpool.GlobalTimerPool.Put(d.timer)
+				timerutil.GlobalTimerPool.Put(d.timer)
 				return
 			}
 		case <-td.ctx.Done():

client/tso_service_discovery.go

@@ -30,7 +30,7 @@ import (
 	"github.com/pingcap/kvproto/pkg/tsopb"
 	"github.com/pingcap/log"
 	"github.com/tikv/pd/client/errs"
-	"github.com/tikv/pd/client/grpcutil"
+	"github.com/tikv/pd/client/utils/grpcutil"
 	"go.uber.org/zap"
 	"google.golang.org/grpc"
 )

client/timerpool/pool.go → client/utils/timerutil/pool.go

@@ -4,23 +4,23 @@
 
 // Note: This file is copied from https://go-review.googlesource.com/c/go/+/276133
 
-package timerpool
+package timerutil
 
 import (
 	"sync"
 	"time"
 )
 
 // GlobalTimerPool is a global pool for reusing *time.Timer.
-var GlobalTimerPool TimerPool
+var GlobalTimerPool timerPool
 
-// TimerPool is a wrapper of sync.Pool which caches *time.Timer for reuse.
-type TimerPool struct {
+// timerPool is a wrapper of sync.Pool which caches *time.Timer for reuse.
+type timerPool struct {
 	pool sync.Pool
 }
 
 // Get returns a timer with a given duration.
-func (tp *TimerPool) Get(d time.Duration) *time.Timer {
+func (tp *timerPool) Get(d time.Duration) *time.Timer {
 	if v := tp.pool.Get(); v != nil {
 		timer := v.(*time.Timer)
 		timer.Reset(d)
@@ -32,7 +32,7 @@ func (tp *TimerPool) Get(d time.Duration) *time.Timer {
 // Put tries to call timer.Stop() before putting it back into pool,
 // if the timer.Stop() returns false (it has either already expired or been stopped),
 // have a shot at draining the channel with residual time if there is one.
-func (tp *TimerPool) Put(timer *time.Timer) {
+func (tp *timerPool) Put(timer *time.Timer) {
 	if !timer.Stop() {
 		select {
 		case <-timer.C:

client/timerpool/pool_test.go → client/utils/timerutil/pool_test.go

@@ -4,15 +4,15 @@
 
 // Note: This file is copied from https://go-review.googlesource.com/c/go/+/276133
 
-package timerpool
+package timerutil
 
 import (
 	"testing"
 	"time"
 )
 
 func TestTimerPool(t *testing.T) {
-	var tp TimerPool
+	var tp timerPool
 
 	for range 100 {
 		timer := tp.Get(20 * time.Millisecond)

pkg/timerpool/pool.go → pkg/utils/timerutil/pool.go

@@ -4,23 +4,23 @@
 
 // Note: This file is copied from https://go-review.googlesource.com/c/go/+/276133
 
-package timerpool
+package timerutil
 
 import (
 	"sync"
 	"time"
 )
 
 // GlobalTimerPool is a global pool for reusing *time.Timer.
-var GlobalTimerPool TimerPool
+var GlobalTimerPool timerPool
 
-// TimerPool is a wrapper of sync.Pool which caches *time.Timer for reuse.
-type TimerPool struct {
+// timerPool is a wrapper of sync.Pool which caches *time.Timer for reuse.
+type timerPool struct {
 	pool sync.Pool
 }
 
 // Get returns a timer with a given duration.
-func (tp *TimerPool) Get(d time.Duration) *time.Timer {
+func (tp *timerPool) Get(d time.Duration) *time.Timer {
 	if v := tp.pool.Get(); v != nil {
 		timer := v.(*time.Timer)
 		timer.Reset(d)
@@ -32,7 +32,7 @@ func (tp *TimerPool) Get(d time.Duration) *time.Timer {
 // Put tries to call timer.Stop() before putting it back into pool,
 // if the timer.Stop() returns false (it has either already expired or been stopped),
 // have a shot at draining the channel with residual time if there is one.
-func (tp *TimerPool) Put(timer *time.Timer) {
+func (tp *timerPool) Put(timer *time.Timer) {
 	if !timer.Stop() {
 		select {
 		case <-timer.C:

pkg/timerpool/pool_test.go → pkg/utils/timerutil/pool_test.go

@@ -4,15 +4,15 @@
 
 // Note: This file is copied from https://go-review.googlesource.com/c/go/+/276133
 
-package timerpool
+package timerutil
 
 import (
 	"testing"
 	"time"
 )
 
 func TestTimerPool(t *testing.T) {
-	var tp TimerPool
+	var tp timerPool
 
 	for range 100 {
 		timer := tp.Get(20 * time.Millisecond)

pkg/utils/tsoutil/tso_dispatcher.go

@@ -24,9 +24,9 @@ import (
 	"github.com/pingcap/log"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/tikv/pd/pkg/errs"
-	"github.com/tikv/pd/pkg/timerpool"
 	"github.com/tikv/pd/pkg/utils/etcdutil"
 	"github.com/tikv/pd/pkg/utils/logutil"
+	"github.com/tikv/pd/pkg/utils/timerutil"
 	"go.uber.org/zap"
 	"google.golang.org/grpc"
 )
@@ -209,7 +209,7 @@ func NewTSDeadline(
 	done chan struct{},
 	cancel context.CancelFunc,
 ) *TSDeadline {
-	timer := timerpool.GlobalTimerPool.Get(timeout)
+	timer := timerutil.GlobalTimerPool.Get(timeout)
 	return &TSDeadline{
 		timer:  timer,
 		done:   done,
@@ -230,11 +230,11 @@ func WatchTSDeadline(ctx context.Context, tsDeadlineCh <-chan *TSDeadline) {
 				log.Error("tso proxy request processing is canceled due to timeout",
 					errs.ZapError(errs.ErrProxyTSOTimeout))
 				d.cancel()
-				timerpool.GlobalTimerPool.Put(d.timer)
+				timerutil.GlobalTimerPool.Put(d.timer)
 			case <-d.done:
-				timerpool.GlobalTimerPool.Put(d.timer)
+				timerutil.GlobalTimerPool.Put(d.timer)
 			case <-ctx.Done():
-				timerpool.GlobalTimerPool.Put(d.timer)
+				timerutil.GlobalTimerPool.Put(d.timer)
 				return
 			}
 		case <-ctx.Done():

tests/integrations/client/client_test.go

@@ -790,7 +790,7 @@ func (suite *followerForwardAndHandleTestSuite) TestGetTsoAndRegionByFollowerFor
 	leader := cluster.GetLeaderServer()
 
 	follower := cluster.GetServer(cluster.GetFollower())
-	re.NoError(failpoint.Enable("github.com/tikv/pd/client/grpcutil/unreachableNetwork2", fmt.Sprintf("return(\"%s\")", follower.GetAddr())))
+	re.NoError(failpoint.Enable("github.com/tikv/pd/client/utils/grpcutil/unreachableNetwork2", fmt.Sprintf("return(\"%s\")", follower.GetAddr())))
 
 	cli := setupCli(ctx, re, suite.endpoints, pd.WithForwardingOption(true))
 	defer cli.Close()
@@ -829,7 +829,7 @@ func (suite *followerForwardAndHandleTestSuite) TestGetTsoAndRegionByFollowerFor
 		return false
 	})
 
-	re.NoError(failpoint.Disable("github.com/tikv/pd/client/grpcutil/unreachableNetwork2"))
+	re.NoError(failpoint.Disable("github.com/tikv/pd/client/utils/grpcutil/unreachableNetwork2"))
 	testutil.Eventually(re, func() bool {
 		physical, logical, err := cli.GetTS(context.TODO())
 		if err == nil {
@@ -859,7 +859,7 @@ func (suite *followerForwardAndHandleTestSuite) TestGetRegionFromLeaderWhenNetwo
 	leader := cluster.GetLeaderServer()
 
 	follower := cluster.GetServer(cluster.GetFollower())
-	re.NoError(failpoint.Enable("github.com/tikv/pd/client/grpcutil/unreachableNetwork2", fmt.Sprintf("return(\"%s\")", follower.GetAddr())))
+	re.NoError(failpoint.Enable("github.com/tikv/pd/client/utils/grpcutil/unreachableNetwork2", fmt.Sprintf("return(\"%s\")", follower.GetAddr())))
 
 	cli := setupCli(ctx, re, suite.endpoints)
 	defer cli.Close()
@@ -877,7 +877,7 @@ func (suite *followerForwardAndHandleTestSuite) TestGetRegionFromLeaderWhenNetwo
 	re.Error(err)
 	re.Nil(r)
 
-	re.NoError(failpoint.Disable("github.com/tikv/pd/client/grpcutil/unreachableNetwork2"))
+	re.NoError(failpoint.Disable("github.com/tikv/pd/client/utils/grpcutil/unreachableNetwork2"))
 	cli.GetServiceDiscovery().CheckMemberChanged()
 	testutil.Eventually(re, func() bool {
 		r, err = cli.GetRegion(context.Background(), []byte("a"))

tests/integrations/mcs/resourcemanager/server_test.go

@@ -24,7 +24,7 @@ import (
 
 	rmpb "github.com/pingcap/kvproto/pkg/resource_manager"
 	"github.com/stretchr/testify/require"
-	"github.com/tikv/pd/client/grpcutil"
+	"github.com/tikv/pd/client/utils/grpcutil"
 	bs "github.com/tikv/pd/pkg/basicserver"
 	"github.com/tikv/pd/pkg/utils/tempurl"
 	"github.com/tikv/pd/pkg/versioninfo"

tests/integrations/mcs/tso/proxy_test.go

@@ -29,7 +29,7 @@ import (
 	"github.com/pingcap/log"
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
-	"github.com/tikv/pd/client/tsoutil"
+	"github.com/tikv/pd/client/utils/tsoutil"
 	"github.com/tikv/pd/pkg/utils/testutil"
 	"github.com/tikv/pd/tests"
 	"go.uber.org/zap"

tests/integrations/realcluster/scheduler_test.go

@@ -24,7 +24,7 @@ import (
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
 	"github.com/tikv/pd/client/http"
-	"github.com/tikv/pd/client/testutil"
+	"github.com/tikv/pd/client/utils/testutil"
 	"github.com/tikv/pd/pkg/schedule/labeler"
 	"github.com/tikv/pd/pkg/schedule/types"
 )

tests/integrations/tso/client_test.go

@@ -29,7 +29,7 @@ import (
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
 	pd "github.com/tikv/pd/client"
-	"github.com/tikv/pd/client/testutil"
+	"github.com/tikv/pd/client/utils/testutil"
 	bs "github.com/tikv/pd/pkg/basicserver"
 	"github.com/tikv/pd/pkg/mcs/utils/constant"
 	"github.com/tikv/pd/pkg/slice"

tools/pd-api-bench/main.go

@@ -35,7 +35,7 @@ import (
 	flag "github.com/spf13/pflag"
 	pd "github.com/tikv/pd/client"
 	pdHttp "github.com/tikv/pd/client/http"
-	"github.com/tikv/pd/client/tlsutil"
+	"github.com/tikv/pd/client/utils/tlsutil"
 	"github.com/tikv/pd/pkg/mcs/utils"
 	"github.com/tikv/pd/pkg/utils/logutil"
 	"github.com/tikv/pd/tools/pd-api-bench/cases"

tools/pd-heartbeat-bench/main.go

@@ -39,9 +39,9 @@ import (
 	"github.com/pingcap/kvproto/pkg/pdpb"
 	"github.com/pingcap/log"
 	"github.com/spf13/pflag"
-	"github.com/tikv/pd/client/grpcutil"
 	pdHttp "github.com/tikv/pd/client/http"
-	"github.com/tikv/pd/client/tlsutil"
+	"github.com/tikv/pd/client/utils/grpcutil"
+	"github.com/tikv/pd/client/utils/tlsutil"
 	"github.com/tikv/pd/pkg/codec"
 	"github.com/tikv/pd/pkg/mcs/utils"
 	"github.com/tikv/pd/pkg/statistics"