*: move all util relative package to utils (#5764)

ref #5766 *: move all util relative package to utils Signed-off-by: nolouch <nolouch@gmail.com>
tikv · Dec 8, 2022 · 8227cdb · 8227cdb
1 parent 8c5c666
commit 8227cdb
Show file tree

Hide file tree

Showing 256 changed files with 328 additions and 328 deletions.
diff --git a/cmd/pd-server/main.go b/cmd/pd-server/main.go
@@ -27,9 +27,9 @@ import (
 	"github.com/tikv/pd/pkg/autoscaling"
 	"github.com/tikv/pd/pkg/dashboard"
 	"github.com/tikv/pd/pkg/errs"
-	"github.com/tikv/pd/pkg/logutil"
-	"github.com/tikv/pd/pkg/metricutil"
 	"github.com/tikv/pd/pkg/swaggerserver"
+	"github.com/tikv/pd/pkg/utils/logutil"
+	"github.com/tikv/pd/pkg/utils/metricutil"
 	"github.com/tikv/pd/server"
 	"github.com/tikv/pd/server/api"
 	"github.com/tikv/pd/server/apiv2"

diff --git a/pkg/audit/audit.go b/pkg/audit/audit.go
@@ -19,7 +19,7 @@ import (
 
 	"github.com/pingcap/log"
 	"github.com/prometheus/client_golang/prometheus"
-	"github.com/tikv/pd/pkg/requestutil"
+	"github.com/tikv/pd/pkg/utils/requestutil"
 	"go.uber.org/zap"
 )
 

diff --git a/pkg/audit/audit_test.go b/pkg/audit/audit_test.go
@@ -28,7 +28,7 @@ import (
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
 	"github.com/stretchr/testify/require"
-	"github.com/tikv/pd/pkg/requestutil"
+	"github.com/tikv/pd/pkg/utils/requestutil"
 )
 
 func TestLabelMatcher(t *testing.T) {

diff --git a/pkg/autoscaling/calculation.go b/pkg/autoscaling/calculation.go
@@ -24,7 +24,7 @@ import (
 	"github.com/pingcap/log"
 	promClient "github.com/prometheus/client_golang/api"
 	"github.com/tikv/pd/pkg/errs"
-	"github.com/tikv/pd/pkg/typeutil"
+	"github.com/tikv/pd/pkg/utils/typeutil"
 	"github.com/tikv/pd/server/cluster"
 	"github.com/tikv/pd/server/config"
 	"github.com/tikv/pd/server/core"

diff --git a/pkg/autoscaling/service.go b/pkg/autoscaling/service.go
@@ -18,7 +18,7 @@ import (
 	"context"
 	"net/http"
 
-	"github.com/tikv/pd/pkg/apiutil/serverapi"
+	"github.com/tikv/pd/pkg/utils/apiutil/serverapi"
 	"github.com/tikv/pd/server"
 	"github.com/unrolled/render"
 	"github.com/urfave/negroni"

diff --git a/pkg/autoscaling/types.go b/pkg/autoscaling/types.go
@@ -20,7 +20,7 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/tikv/pd/pkg/etcdutil"
+	"github.com/tikv/pd/pkg/utils/etcdutil"
 	"go.etcd.io/etcd/clientv3"
 )
 

diff --git a/pkg/cache/cache.go b/pkg/cache/cache.go
@@ -14,7 +14,7 @@
 
 package cache
 
-import "github.com/tikv/pd/pkg/syncutil"
+import "github.com/tikv/pd/pkg/utils/syncutil"
 
 // Cache is an interface for cache system
 type Cache interface {

diff --git a/pkg/cache/fifo.go b/pkg/cache/fifo.go
@@ -17,7 +17,7 @@ package cache
 import (
 	"container/list"
 
-	"github.com/tikv/pd/pkg/syncutil"
+	"github.com/tikv/pd/pkg/utils/syncutil"
 )
 
 // FIFO is 'First-In-First-Out' cache.

diff --git a/pkg/cache/ttl.go b/pkg/cache/ttl.go
@@ -19,7 +19,7 @@ import (
 	"time"
 
 	"github.com/pingcap/log"
-	"github.com/tikv/pd/pkg/syncutil"
+	"github.com/tikv/pd/pkg/utils/syncutil"
 	"go.uber.org/zap"
 )
 

diff --git a/pkg/dashboard/adapter/manager.go b/pkg/dashboard/adapter/manager.go
@@ -24,7 +24,7 @@ import (
 
 	"github.com/pingcap/log"
 	"github.com/tikv/pd/pkg/errs"
-	"github.com/tikv/pd/pkg/logutil"
+	"github.com/tikv/pd/pkg/utils/logutil"
 	"github.com/tikv/pd/server"
 	"github.com/tikv/pd/server/cluster"
 )

diff --git a/pkg/dashboard/adapter/redirector.go b/pkg/dashboard/adapter/redirector.go
@@ -22,7 +22,7 @@ import (
 
 	"github.com/pingcap/tidb-dashboard/pkg/apiserver"
 	"github.com/pingcap/tidb-dashboard/pkg/utils"
-	"github.com/tikv/pd/pkg/syncutil"
+	"github.com/tikv/pd/pkg/utils/syncutil"
 )
 
 const (

diff --git a/pkg/election/leadership.go b/pkg/election/leadership.go
@@ -22,7 +22,7 @@ import (
 	"github.com/pingcap/kvproto/pkg/pdpb"
 	"github.com/pingcap/log"
 	"github.com/tikv/pd/pkg/errs"
-	"github.com/tikv/pd/pkg/etcdutil"
+	"github.com/tikv/pd/pkg/utils/etcdutil"
 	"github.com/tikv/pd/server/storage/kv"
 	"go.etcd.io/etcd/clientv3"
 	"go.etcd.io/etcd/mvcc/mvccpb"

diff --git a/pkg/election/leadership_test.go b/pkg/election/leadership_test.go
@@ -20,7 +20,7 @@ import (
 	"time"
 
 	"github.com/stretchr/testify/require"
-	"github.com/tikv/pd/pkg/etcdutil"
+	"github.com/tikv/pd/pkg/utils/etcdutil"
 	"go.etcd.io/etcd/clientv3"
 	"go.etcd.io/etcd/embed"
 )

diff --git a/pkg/election/lease.go b/pkg/election/lease.go
@@ -21,8 +21,8 @@ import (
 
 	"github.com/pingcap/log"
 	"github.com/tikv/pd/pkg/errs"
-	"github.com/tikv/pd/pkg/etcdutil"
-	"github.com/tikv/pd/pkg/typeutil"
+	"github.com/tikv/pd/pkg/utils/etcdutil"
+	"github.com/tikv/pd/pkg/utils/typeutil"
 	"go.etcd.io/etcd/clientv3"
 	"go.uber.org/zap"
 )

diff --git a/pkg/election/lease_test.go b/pkg/election/lease_test.go
@@ -20,7 +20,7 @@ import (
 	"time"
 
 	"github.com/stretchr/testify/require"
-	"github.com/tikv/pd/pkg/etcdutil"
+	"github.com/tikv/pd/pkg/utils/etcdutil"
 	"go.etcd.io/etcd/clientv3"
 	"go.etcd.io/etcd/embed"
 )

diff --git a/pkg/encryption/config.go b/pkg/encryption/config.go
@@ -19,7 +19,7 @@ import (
 
 	"github.com/pingcap/kvproto/pkg/encryptionpb"
 	"github.com/tikv/pd/pkg/errs"
-	"github.com/tikv/pd/pkg/typeutil"
+	"github.com/tikv/pd/pkg/utils/typeutil"
 )
 
 const (

diff --git a/pkg/encryption/config_test.go b/pkg/encryption/config_test.go
@@ -19,7 +19,7 @@ import (
 	"time"
 
 	"github.com/stretchr/testify/require"
-	"github.com/tikv/pd/pkg/typeutil"
+	"github.com/tikv/pd/pkg/utils/typeutil"
 )
 
 func TestAdjustDefaultValue(t *testing.T) {

diff --git a/pkg/encryption/region_crypter.go b/pkg/encryption/region_crypter.go
@@ -23,7 +23,7 @@ import (
 	"github.com/pingcap/kvproto/pkg/encryptionpb"
 	"github.com/pingcap/kvproto/pkg/metapb"
 	"github.com/tikv/pd/pkg/errs"
-	"github.com/tikv/pd/pkg/typeutil"
+	"github.com/tikv/pd/pkg/utils/typeutil"
 	"github.com/tikv/pd/server/core"
 )
 

diff --git a/pkg/mock/mockcluster/config.go b/pkg/mock/mockcluster/config.go
@@ -17,7 +17,7 @@ package mockcluster
 import (
 	"time"
 
-	"github.com/tikv/pd/pkg/typeutil"
+	"github.com/tikv/pd/pkg/utils/typeutil"
 	"github.com/tikv/pd/server/config"
 )
 

diff --git a/pkg/mock/mockcluster/mockcluster.go b/pkg/mock/mockcluster/mockcluster.go
@@ -26,7 +26,7 @@ import (
 	"github.com/pingcap/log"
 	"github.com/tikv/pd/pkg/errs"
 	"github.com/tikv/pd/pkg/mock/mockid"
-	"github.com/tikv/pd/pkg/typeutil"
+	"github.com/tikv/pd/pkg/utils/typeutil"
 	"github.com/tikv/pd/server/config"
 	"github.com/tikv/pd/server/core"
 	"github.com/tikv/pd/server/core/storelimit"

diff --git a/pkg/mock/mockhbstream/mockhbstream_test.go b/pkg/mock/mockhbstream/mockhbstream_test.go
@@ -23,8 +23,8 @@ import (
 	"github.com/pingcap/kvproto/pkg/pdpb"
 	"github.com/stretchr/testify/require"
 	"github.com/tikv/pd/pkg/mock/mockcluster"
-	"github.com/tikv/pd/pkg/testutil"
-	"github.com/tikv/pd/pkg/typeutil"
+	"github.com/tikv/pd/pkg/utils/testutil"
+	"github.com/tikv/pd/pkg/utils/typeutil"
 	"github.com/tikv/pd/server/config"
 	"github.com/tikv/pd/server/core"
 	"github.com/tikv/pd/server/schedule/hbstream"

diff --git a/pkg/progress/progress.go b/pkg/progress/progress.go
@@ -21,7 +21,7 @@ import (
 	"time"
 
 	"github.com/tikv/pd/pkg/errs"
-	"github.com/tikv/pd/pkg/syncutil"
+	"github.com/tikv/pd/pkg/utils/syncutil"
 )
 
 // speedStatisticalWindow is the speed calculation window

diff --git a/pkg/ratelimit/concurrency_limiter.go b/pkg/ratelimit/concurrency_limiter.go
@@ -14,7 +14,7 @@
 
 package ratelimit
 
-import "github.com/tikv/pd/pkg/syncutil"
+import "github.com/tikv/pd/pkg/utils/syncutil"
 
 type concurrencyLimiter struct {
 	mu      syncutil.RWMutex

diff --git a/pkg/ratelimit/ratelimiter.go b/pkg/ratelimit/ratelimiter.go
@@ -18,7 +18,7 @@ import (
 	"context"
 	"time"
 
-	"github.com/tikv/pd/pkg/syncutil"
+	"github.com/tikv/pd/pkg/utils/syncutil"
 	"golang.org/x/time/rate"
 )
 

diff --git a/pkg/apiutil/apiutil.go → pkg/utils/apiutil/apiutil.go b/pkg/apiutil/apiutil.go → pkg/utils/apiutil/apiutil.go
diff --git a/pkg/apiutil/apiutil_test.go → pkg/utils/apiutil/apiutil_test.go b/pkg/apiutil/apiutil_test.go → pkg/utils/apiutil/apiutil_test.go
diff --git a/pkg/apiutil/serverapi/middleware.go → pkg/utils/apiutil/serverapi/middleware.go b/pkg/apiutil/serverapi/middleware.go → pkg/utils/apiutil/serverapi/middleware.go
diff --git a/pkg/assertutil/assertutil.go → pkg/utils/assertutil/assertutil.go b/pkg/assertutil/assertutil.go → pkg/utils/assertutil/assertutil.go
diff --git a/pkg/assertutil/assertutil_test.go → pkg/utils/assertutil/assertutil_test.go b/pkg/assertutil/assertutil_test.go → pkg/utils/assertutil/assertutil_test.go
diff --git a/pkg/etcdutil/etcdutil.go → pkg/utils/etcdutil/etcdutil.go b/pkg/etcdutil/etcdutil.go → pkg/utils/etcdutil/etcdutil.go
@@ -27,7 +27,7 @@ import (
 	"github.com/pingcap/errors"
 	"github.com/pingcap/log"
 	"github.com/tikv/pd/pkg/errs"
-	"github.com/tikv/pd/pkg/tempurl"
+	"github.com/tikv/pd/pkg/utils/tempurl"
 	"go.etcd.io/etcd/clientv3"
 	"go.etcd.io/etcd/embed"
 	"go.etcd.io/etcd/etcdserver"

diff --git a/pkg/etcdutil/etcdutil_test.go → pkg/utils/etcdutil/etcdutil_test.go b/pkg/etcdutil/etcdutil_test.go → pkg/utils/etcdutil/etcdutil_test.go
diff --git a/pkg/grpcutil/grpcutil.go → pkg/utils/grpcutil/grpcutil.go b/pkg/grpcutil/grpcutil.go → pkg/utils/grpcutil/grpcutil.go
diff --git a/pkg/grpcutil/grpcutil_test.go → pkg/utils/grpcutil/grpcutil_test.go b/pkg/grpcutil/grpcutil_test.go → pkg/utils/grpcutil/grpcutil_test.go
@@ -24,9 +24,9 @@ func TestToTLSConfig(t *testing.T) {
 	t.Parallel()
 	re := require.New(t)
 	tlsConfig := TLSConfig{
-		KeyPath:  "../../tests/client/cert/pd-server-key.pem",
-		CertPath: "../../tests/client/cert/pd-server.pem",
-		CAPath:   "../../tests/client/cert/ca.pem",
+		KeyPath:  "../../../tests/client/cert/pd-server-key.pem",
+		CertPath: "../../../tests/client/cert/pd-server.pem",
+		CAPath:   "../../../tests/client/cert/ca.pem",
 	}
 	// test without bytes
 	_, err := tlsConfig.ToTLSConfig()

diff --git a/pkg/jsonutil/jsonutil.go → pkg/utils/jsonutil/jsonutil.go b/pkg/jsonutil/jsonutil.go → pkg/utils/jsonutil/jsonutil.go
@@ -18,7 +18,7 @@ import (
 	"bytes"
 	"encoding/json"
 
-	"github.com/tikv/pd/pkg/reflectutil"
+	"github.com/tikv/pd/pkg/utils/reflectutil"
 )
 
 // AddKeyValue is used to add a key value pair into `old`

diff --git a/pkg/jsonutil/jsonutil_test.go → pkg/utils/jsonutil/jsonutil_test.go b/pkg/jsonutil/jsonutil_test.go → pkg/utils/jsonutil/jsonutil_test.go
diff --git a/pkg/keyutil/util.go → pkg/utils/keyutil/util.go b/pkg/keyutil/util.go → pkg/utils/keyutil/util.go
diff --git a/pkg/keyutil/util_test.go → pkg/utils/keyutil/util_test.go b/pkg/keyutil/util_test.go → pkg/utils/keyutil/util_test.go
diff --git a/pkg/logutil/log.go → pkg/utils/logutil/log.go b/pkg/logutil/log.go → pkg/utils/logutil/log.go
diff --git a/pkg/logutil/log_test.go → pkg/utils/logutil/log_test.go b/pkg/logutil/log_test.go → pkg/utils/logutil/log_test.go
diff --git a/pkg/metricutil/metricutil.go → pkg/utils/metricutil/metricutil.go b/pkg/metricutil/metricutil.go → pkg/utils/metricutil/metricutil.go
@@ -23,7 +23,7 @@ import (
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/push"
 	"github.com/tikv/pd/pkg/errs"
-	"github.com/tikv/pd/pkg/typeutil"
+	"github.com/tikv/pd/pkg/utils/typeutil"
 )
 
 const zeroDuration = time.Duration(0)

diff --git a/pkg/metricutil/metricutil_test.go → pkg/utils/metricutil/metricutil_test.go b/pkg/metricutil/metricutil_test.go → pkg/utils/metricutil/metricutil_test.go
@@ -19,7 +19,7 @@ import (
 	"time"
 
 	"github.com/stretchr/testify/require"
-	"github.com/tikv/pd/pkg/typeutil"
+	"github.com/tikv/pd/pkg/utils/typeutil"
 )
 
 func TestCamelCaseToSnakeCase(t *testing.T) {

diff --git a/pkg/netutil/address.go → pkg/utils/netutil/address.go b/pkg/netutil/address.go → pkg/utils/netutil/address.go
diff --git a/pkg/netutil/address_test.go → pkg/utils/netutil/address_test.go b/pkg/netutil/address_test.go → pkg/utils/netutil/address_test.go
diff --git a/pkg/reflectutil/tag.go → pkg/utils/reflectutil/tag.go b/pkg/reflectutil/tag.go → pkg/utils/reflectutil/tag.go
diff --git a/pkg/reflectutil/tag_test.go → pkg/utils/reflectutil/tag_test.go b/pkg/reflectutil/tag_test.go → pkg/utils/reflectutil/tag_test.go
diff --git a/pkg/requestutil/context.go → pkg/utils/requestutil/context.go b/pkg/requestutil/context.go → pkg/utils/requestutil/context.go
diff --git a/pkg/requestutil/context_test.go → pkg/utils/requestutil/context_test.go b/pkg/requestutil/context_test.go → pkg/utils/requestutil/context_test.go
diff --git a/pkg/requestutil/request_info.go → pkg/utils/requestutil/request_info.go b/pkg/requestutil/request_info.go → pkg/utils/requestutil/request_info.go
@@ -22,7 +22,7 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/tikv/pd/pkg/apiutil"
+	"github.com/tikv/pd/pkg/utils/apiutil"
 )
 
 // RequestInfo holds service information from http.Request

diff --git a/pkg/syncutil/lock_group.go → pkg/utils/syncutil/lock_group.go b/pkg/syncutil/lock_group.go → pkg/utils/syncutil/lock_group.go
diff --git a/pkg/syncutil/lock_group_test.go → pkg/utils/syncutil/lock_group_test.go b/pkg/syncutil/lock_group_test.go → pkg/utils/syncutil/lock_group_test.go
diff --git a/pkg/syncutil/mutex_deadlock.go → pkg/utils/syncutil/mutex_deadlock.go b/pkg/syncutil/mutex_deadlock.go → pkg/utils/syncutil/mutex_deadlock.go
diff --git a/pkg/syncutil/mutex_sync.go → pkg/utils/syncutil/mutex_sync.go b/pkg/syncutil/mutex_sync.go → pkg/utils/syncutil/mutex_sync.go
diff --git a/pkg/tempurl/check_env.go → pkg/utils/tempurl/check_env.go b/pkg/tempurl/check_env.go → pkg/utils/tempurl/check_env.go
diff --git a/pkg/tempurl/check_env_linux.go → pkg/utils/tempurl/check_env_linux.go b/pkg/tempurl/check_env_linux.go → pkg/utils/tempurl/check_env_linux.go
diff --git a/pkg/tempurl/tempurl.go → pkg/utils/tempurl/tempurl.go b/pkg/tempurl/tempurl.go → pkg/utils/tempurl/tempurl.go
diff --git a/pkg/testutil/api_check.go → pkg/utils/testutil/api_check.go b/pkg/testutil/api_check.go → pkg/utils/testutil/api_check.go
@@ -20,7 +20,7 @@ import (
 	"net/http"
 
 	"github.com/stretchr/testify/require"
-	"github.com/tikv/pd/pkg/apiutil"
+	"github.com/tikv/pd/pkg/utils/apiutil"
 )
 
 // Status is used to check whether http response code is equal given code

diff --git a/pkg/testutil/leak.go → pkg/utils/testutil/leak.go b/pkg/testutil/leak.go → pkg/utils/testutil/leak.go
diff --git a/pkg/testutil/operator_check.go → pkg/utils/testutil/operator_check.go b/pkg/testutil/operator_check.go → pkg/utils/testutil/operator_check.go
diff --git a/pkg/testutil/testutil.go → pkg/utils/testutil/testutil.go b/pkg/testutil/testutil.go → pkg/utils/testutil/testutil.go
diff --git a/pkg/tsoutil/tso.go → pkg/utils/tsoutil/tso.go b/pkg/tsoutil/tso.go → pkg/utils/tsoutil/tso.go
diff --git a/pkg/typeutil/clone.go → pkg/utils/typeutil/clone.go b/pkg/typeutil/clone.go → pkg/utils/typeutil/clone.go
diff --git a/pkg/typeutil/clone_test.go → pkg/utils/typeutil/clone_test.go b/pkg/typeutil/clone_test.go → pkg/utils/typeutil/clone_test.go
diff --git a/pkg/typeutil/comparison.go → pkg/utils/typeutil/comparison.go b/pkg/typeutil/comparison.go → pkg/utils/typeutil/comparison.go
diff --git a/pkg/typeutil/comparison_test.go → pkg/utils/typeutil/comparison_test.go b/pkg/typeutil/comparison_test.go → pkg/utils/typeutil/comparison_test.go
diff --git a/pkg/typeutil/conversion.go → pkg/utils/typeutil/conversion.go b/pkg/typeutil/conversion.go → pkg/utils/typeutil/conversion.go
diff --git a/pkg/typeutil/conversion_test.go → pkg/utils/typeutil/conversion_test.go b/pkg/typeutil/conversion_test.go → pkg/utils/typeutil/conversion_test.go
diff --git a/pkg/typeutil/duration.go → pkg/utils/typeutil/duration.go b/pkg/typeutil/duration.go → pkg/utils/typeutil/duration.go
diff --git a/pkg/typeutil/duration_test.go → pkg/utils/typeutil/duration_test.go b/pkg/typeutil/duration_test.go → pkg/utils/typeutil/duration_test.go
diff --git a/pkg/typeutil/size.go → pkg/utils/typeutil/size.go b/pkg/typeutil/size.go → pkg/utils/typeutil/size.go
diff --git a/pkg/typeutil/size_test.go → pkg/utils/typeutil/size_test.go b/pkg/typeutil/size_test.go → pkg/utils/typeutil/size_test.go
diff --git a/pkg/typeutil/string_slice.go → pkg/utils/typeutil/string_slice.go b/pkg/typeutil/string_slice.go → pkg/utils/typeutil/string_slice.go
diff --git a/pkg/typeutil/string_slice_test.go → pkg/utils/typeutil/string_slice_test.go b/pkg/typeutil/string_slice_test.go → pkg/utils/typeutil/string_slice_test.go
diff --git a/pkg/typeutil/time.go → pkg/utils/typeutil/time.go b/pkg/typeutil/time.go → pkg/utils/typeutil/time.go
diff --git a/pkg/typeutil/time_test.go → pkg/utils/typeutil/time_test.go b/pkg/typeutil/time_test.go → pkg/utils/typeutil/time_test.go
diff --git a/plugin/scheduler_example/evict_leader.go b/plugin/scheduler_example/evict_leader.go
@@ -22,9 +22,9 @@ import (
 	"github.com/gorilla/mux"
 	"github.com/pingcap/errors"
 	"github.com/pingcap/log"
-	"github.com/tikv/pd/pkg/apiutil"
 	"github.com/tikv/pd/pkg/errs"
-	"github.com/tikv/pd/pkg/syncutil"
+	"github.com/tikv/pd/pkg/utils/apiutil"
+	"github.com/tikv/pd/pkg/utils/syncutil"
 	"github.com/tikv/pd/server/core"
 	"github.com/tikv/pd/server/schedule"
 	"github.com/tikv/pd/server/schedule/filter"

diff --git a/server/api/admin.go b/server/api/admin.go
@@ -21,8 +21,8 @@ import (
 	"strconv"
 
 	"github.com/gorilla/mux"
-	"github.com/tikv/pd/pkg/apiutil"
 	"github.com/tikv/pd/pkg/errs"
+	"github.com/tikv/pd/pkg/utils/apiutil"
 	"github.com/tikv/pd/server"
 	"github.com/unrolled/render"
 )

diff --git a/server/api/admin_test.go b/server/api/admin_test.go
@@ -25,8 +25,8 @@ import (
 	"github.com/pingcap/kvproto/pkg/metapb"
 	"github.com/pingcap/kvproto/pkg/pdpb"
 	"github.com/stretchr/testify/suite"
-	"github.com/tikv/pd/pkg/apiutil"
-	tu "github.com/tikv/pd/pkg/testutil"
+	"github.com/tikv/pd/pkg/utils/apiutil"
+	tu "github.com/tikv/pd/pkg/utils/testutil"
 	"github.com/tikv/pd/server"
 	"github.com/tikv/pd/server/core"
 )

diff --git a/server/api/checker.go b/server/api/checker.go
@@ -18,7 +18,7 @@ import (
 	"net/http"
 
 	"github.com/gorilla/mux"
-	"github.com/tikv/pd/pkg/apiutil"
+	"github.com/tikv/pd/pkg/utils/apiutil"
 	"github.com/tikv/pd/server"
 	"github.com/unrolled/render"
 )

diff --git a/server/api/checker_test.go b/server/api/checker_test.go
@@ -22,7 +22,7 @@ import (
 
 	"github.com/pingcap/kvproto/pkg/metapb"
 	"github.com/stretchr/testify/suite"
-	tu "github.com/tikv/pd/pkg/testutil"
+	tu "github.com/tikv/pd/pkg/utils/testutil"
 	"github.com/tikv/pd/server"
 )
 

diff --git a/server/api/cluster_test.go b/server/api/cluster_test.go
@@ -21,7 +21,7 @@ import (
 
 	"github.com/pingcap/kvproto/pkg/metapb"
 	"github.com/stretchr/testify/suite"
-	tu "github.com/tikv/pd/pkg/testutil"
+	tu "github.com/tikv/pd/pkg/utils/testutil"
 	"github.com/tikv/pd/server"
 	"github.com/tikv/pd/server/cluster"
 	"github.com/tikv/pd/server/config"

diff --git a/server/api/config.go b/server/api/config.go
@@ -27,10 +27,10 @@ import (
 	"github.com/pingcap/errcode"
 	"github.com/pingcap/errors"
 	"github.com/pingcap/log"
-	"github.com/tikv/pd/pkg/apiutil"
-	"github.com/tikv/pd/pkg/jsonutil"
-	"github.com/tikv/pd/pkg/logutil"
-	"github.com/tikv/pd/pkg/reflectutil"
+	"github.com/tikv/pd/pkg/utils/apiutil"
+	"github.com/tikv/pd/pkg/utils/jsonutil"
+	"github.com/tikv/pd/pkg/utils/logutil"
+	"github.com/tikv/pd/pkg/utils/reflectutil"
 	"github.com/tikv/pd/server"
 	"github.com/tikv/pd/server/config"
 	"github.com/unrolled/render"

diff --git a/server/api/config_test.go b/server/api/config_test.go
@@ -21,8 +21,8 @@ import (
 	"time"
 
 	"github.com/stretchr/testify/suite"
-	tu "github.com/tikv/pd/pkg/testutil"
-	"github.com/tikv/pd/pkg/typeutil"
+	tu "github.com/tikv/pd/pkg/utils/testutil"
+	"github.com/tikv/pd/pkg/utils/typeutil"
 	"github.com/tikv/pd/server"
 	"github.com/tikv/pd/server/config"
 	"github.com/tikv/pd/server/versioninfo"

diff --git a/server/api/diagnostic_test.go b/server/api/diagnostic_test.go
@@ -22,8 +22,8 @@ import (
 
 	"github.com/pingcap/kvproto/pkg/metapb"
 	"github.com/stretchr/testify/suite"
-	"github.com/tikv/pd/pkg/apiutil"
-	tu "github.com/tikv/pd/pkg/testutil"
+	"github.com/tikv/pd/pkg/utils/apiutil"
+	tu "github.com/tikv/pd/pkg/utils/testutil"
 	"github.com/tikv/pd/server"
 	"github.com/tikv/pd/server/cluster"
 	"github.com/tikv/pd/server/config"

diff --git a/server/api/etcd_api_test.go b/server/api/etcd_api_test.go
@@ -19,7 +19,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
-	tu "github.com/tikv/pd/pkg/testutil"
+	tu "github.com/tikv/pd/pkg/utils/testutil"
 )
 
 func TestGRPCGateway(t *testing.T) {