Merge branch 'master' into upgrade_prom

.golangci.yml

@@ -28,6 +28,7 @@ linters:
     - protogetter
     - reassign
     - intrange
+    - gci
 linters-settings:
   gocritic:
     # Which checks should be disabled; can't be combined with 'enabled-checks'; default is empty
@@ -233,6 +234,13 @@ linters-settings:
             desc: "Use 'sync/atomic' instead of 'go.uber.org/atomic'"
           - pkg: github.com/pkg/errors
             desc: "Use 'github.com/pingcap/errors' instead of 'github.com/pkg/errors'"
+  gci:
+    sections:
+      - standard
+      - default
+      - prefix(github.com/pingcap)
+      - prefix(github.com/tikv/pd)
+      - blank
 issues:
   exclude-rules:
     - path: (_test\.go|pkg/mock/.*\.go|tests/.*\.go)

client/client.go

@@ -22,15 +22,18 @@ import (
 	"sync"
 	"time"
 
-	cb "github.com/tikv/pd/client/circuitbreaker"
-
 	"github.com/opentracing/opentracing-go"
+	"github.com/prometheus/client_golang/prometheus"
+	"go.uber.org/zap"
+	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/status"
+
 	"github.com/pingcap/errors"
 	"github.com/pingcap/failpoint"
 	"github.com/pingcap/kvproto/pkg/metapb"
 	"github.com/pingcap/kvproto/pkg/pdpb"
 	"github.com/pingcap/log"
-	"github.com/prometheus/client_golang/prometheus"
+
 	"github.com/tikv/pd/client/clients/metastorage"
 	"github.com/tikv/pd/client/clients/router"
 	"github.com/tikv/pd/client/clients/tso"
@@ -39,9 +42,9 @@ import (
 	"github.com/tikv/pd/client/metrics"
 	"github.com/tikv/pd/client/opt"
 	"github.com/tikv/pd/client/pkg/caller"
+	cb "github.com/tikv/pd/client/pkg/circuitbreaker"
 	"github.com/tikv/pd/client/pkg/utils/tlsutil"
 	sd "github.com/tikv/pd/client/servicediscovery"
-	"go.uber.org/zap"
 )
 
 // GlobalConfigItem standard format of KV pair in GlobalConfig client
@@ -509,10 +512,10 @@ func (c *client) GetTSAsync(ctx context.Context) tso.TSFuture {
 	return c.inner.dispatchTSORequestWithRetry(ctx)
 }
 
-// GetLocalTSAsync implements the TSOClient interface.
-//
-// Deprecated: Local TSO will be completely removed in the future. Currently, regardless of the
-// parameters passed in, this method will default to returning the global TSO.
+// Deprecated: the Local TSO feature has been deprecated. Regardless of the
+// parameters passed, the behavior of this interface will be equivalent to
+// `GetTSAsync`. If you want to use a separately deployed TSO service,
+// please refer to the deployment of the TSO microservice.
 func (c *client) GetLocalTSAsync(ctx context.Context, _ string) tso.TSFuture {
 	return c.GetTSAsync(ctx)
 }
@@ -523,10 +526,10 @@ func (c *client) GetTS(ctx context.Context) (physical int64, logical int64, err
 	return resp.Wait()
 }
 
-// GetLocalTS implements the TSOClient interface.
-//
-// Deprecated: Local TSO will be completely removed in the future. Currently, regardless of the
-// parameters passed in, this method will default to returning the global TSO.
+// Deprecated: the Local TSO feature has been deprecated. Regardless of the
+// parameters passed, the behavior of this interface will be equivalent to
+// `GetTS`. If you want to use a separately deployed TSO service,
+// please refer to the deployment of the TSO microservice.
 func (c *client) GetLocalTS(ctx context.Context, _ string) (physical int64, logical int64, err error) {
 	return c.GetTS(ctx)
 }
@@ -660,6 +663,9 @@ func (c *client) GetRegion(ctx context.Context, key []byte, opts ...opt.GetRegio
 	}
 	resp, err := c.inner.regionMetaCircuitBreaker.Execute(func() (*pdpb.GetRegionResponse, cb.Overloading, error) {
 		region, err := pdpb.NewPDClient(serviceClient.GetClientConn()).GetRegion(cctx, req)
+		failpoint.Inject("triggerCircuitBreaker", func() {
+			err = status.Error(codes.ResourceExhausted, "resource exhausted")
+		})
 		return region, isOverloaded(err), err
 	})
 	if serviceClient.NeedRetry(resp.GetHeader().GetError(), err) {

client/client_test.go

@@ -20,11 +20,12 @@ import (
 	"time"
 
 	"github.com/stretchr/testify/require"
+	"go.uber.org/goleak"
+
 	"github.com/tikv/pd/client/opt"
 	"github.com/tikv/pd/client/pkg/caller"
 	"github.com/tikv/pd/client/pkg/utils/testutil"
 	"github.com/tikv/pd/client/pkg/utils/tsoutil"
-	"go.uber.org/goleak"
 )
 
 func TestMain(m *testing.M) {

client/clients/metastorage/client.go

@@ -18,6 +18,7 @@ import (
 	"context"
 
 	"github.com/pingcap/kvproto/pkg/meta_storagepb"
+
 	"github.com/tikv/pd/client/opt"
 )
 

client/clients/router/router_client.go → client/clients/router/client.go

@@ -20,6 +20,7 @@ import (
 	"net/url"
 
 	"github.com/pingcap/kvproto/pkg/metapb"
+
 	"github.com/tikv/pd/client/opt"
 )
 

client/clients/tso/tso_client.go → client/clients/tso/client.go

@@ -22,21 +22,23 @@ import (
 	"sync/atomic"
 	"time"
 
+	"go.uber.org/zap"
+	"google.golang.org/grpc"
+	"google.golang.org/grpc/codes"
+	healthpb "google.golang.org/grpc/health/grpc_health_v1"
+	"google.golang.org/grpc/status"
+
 	"github.com/pingcap/errors"
 	"github.com/pingcap/failpoint"
 	"github.com/pingcap/log"
+
 	"github.com/tikv/pd/client/constants"
 	"github.com/tikv/pd/client/errs"
 	"github.com/tikv/pd/client/metrics"
 	"github.com/tikv/pd/client/opt"
 	"github.com/tikv/pd/client/pkg/utils/grpcutil"
 	"github.com/tikv/pd/client/pkg/utils/tlsutil"
 	sd "github.com/tikv/pd/client/servicediscovery"
-	"go.uber.org/zap"
-	"google.golang.org/grpc"
-	"google.golang.org/grpc/codes"
-	healthpb "google.golang.org/grpc/health/grpc_health_v1"
-	"google.golang.org/grpc/status"
 )
 
 const (
@@ -56,15 +58,15 @@ type Client interface {
 	// the TSO microservice.
 	GetMinTS(ctx context.Context) (int64, int64, error)
 
-	// GetLocalTS gets a local timestamp from PD or TSO microservice.
-	//
-	// Deprecated: Local TSO will be completely removed in the future. Currently, regardless of the
-	// parameters passed in, this method will default to returning the global TSO.
+	// Deprecated: the Local TSO feature has been deprecated. Regardless of the
+	// parameters passed, the behavior of this interface will be equivalent to
+	// `GetTS`. If you want to use a separately deployed TSO service,
+	// please refer to the deployment of the TSO microservice.
 	GetLocalTS(ctx context.Context, _ string) (int64, int64, error)
-	// GetLocalTSAsync gets a local timestamp from PD or TSO microservice, without block the caller.
-	//
-	// Deprecated: Local TSO will be completely removed in the future. Currently, regardless of the
-	// parameters passed in, this method will default to returning the global TSO.
+	// Deprecated: the Local TSO feature has been deprecated. Regardless of the
+	// parameters passed, the behavior of this interface will be equivalent to
+	// `GetTSAsync`. If you want to use a separately deployed TSO service,
+	// please refer to the deployment of the TSO microservice.
 	GetLocalTSAsync(ctx context.Context, _ string) TSFuture
 }
 

client/clients/tso/tso_dispatcher.go → client/clients/tso/dispatcher.go

@@ -25,9 +25,12 @@ import (
 	"time"
 
 	"github.com/opentracing/opentracing-go"
+	"go.uber.org/zap"
+
 	"github.com/pingcap/errors"
 	"github.com/pingcap/failpoint"
 	"github.com/pingcap/log"
+
 	"github.com/tikv/pd/client/constants"
 	"github.com/tikv/pd/client/errs"
 	"github.com/tikv/pd/client/metrics"
@@ -37,7 +40,6 @@ import (
 	"github.com/tikv/pd/client/pkg/utils/timerutil"
 	"github.com/tikv/pd/client/pkg/utils/tsoutil"
 	sd "github.com/tikv/pd/client/servicediscovery"
-	"go.uber.org/zap"
 )
 
 // deadline is used to control the TS request timeout manually,

client/clients/tso/tso_dispatcher_test.go → client/clients/tso/dispatcher_test.go

@@ -22,13 +22,15 @@ import (
 	"testing"
 	"time"
 
-	"github.com/pingcap/failpoint"
-	"github.com/pingcap/log"
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
+	"go.uber.org/zap/zapcore"
+
+	"github.com/pingcap/failpoint"
+	"github.com/pingcap/log"
+
 	"github.com/tikv/pd/client/opt"
 	sd "github.com/tikv/pd/client/servicediscovery"
-	"go.uber.org/zap/zapcore"
 )
 
 type mockTSOServiceProvider struct {

client/clients/tso/tso_request.go → client/clients/tso/request.go

@@ -21,6 +21,7 @@ import (
 	"time"
 
 	"github.com/pingcap/errors"
+
 	"github.com/tikv/pd/client/metrics"
 )
 

client/clients/tso/tso_request_test.go → client/clients/tso/request_test.go

@@ -18,8 +18,9 @@ import (
 	"context"
 	"testing"
 
-	"github.com/pingcap/errors"
 	"github.com/stretchr/testify/require"
+
+	"github.com/pingcap/errors"
 )
 
 func TestTsoRequestWait(t *testing.T) {

client/clients/tso/tso_stream.go → client/clients/tso/stream.go

@@ -23,17 +23,19 @@ import (
 	"sync/atomic"
 	"time"
 
+	"github.com/prometheus/client_golang/prometheus"
+	"go.uber.org/zap"
+	"google.golang.org/grpc"
+
 	"github.com/pingcap/errors"
 	"github.com/pingcap/failpoint"
 	"github.com/pingcap/kvproto/pkg/pdpb"
 	"github.com/pingcap/kvproto/pkg/tsopb"
 	"github.com/pingcap/log"
-	"github.com/prometheus/client_golang/prometheus"
+
 	"github.com/tikv/pd/client/constants"
 	"github.com/tikv/pd/client/errs"
 	"github.com/tikv/pd/client/metrics"
-	"go.uber.org/zap"
-	"google.golang.org/grpc"
 )
 
 // TSO Stream Builder Factory

client/clients/tso/tso_stream_test.go → client/clients/tso/stream_test.go

@@ -21,12 +21,14 @@ import (
 	"testing"
 	"time"
 
-	"github.com/pingcap/errors"
-	"github.com/pingcap/log"
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
-	"github.com/tikv/pd/client/errs"
 	"go.uber.org/zap/zapcore"
+
+	"github.com/pingcap/errors"
+	"github.com/pingcap/log"
+
+	"github.com/tikv/pd/client/errs"
 )
 
 const mockStreamURL = "mock:///"

client/errs/errs.go

@@ -17,10 +17,11 @@ package errs
 import (
 	"strings"
 
-	"github.com/pingcap/errors"
 	"go.uber.org/zap"
 	"go.uber.org/zap/zapcore"
 	"google.golang.org/grpc/codes"
+
+	"github.com/pingcap/errors"
 )
 
 // IsLeaderChange will determine whether there is a leader/primary change.

client/gc_client.go

@@ -19,11 +19,13 @@ import (
 	"time"
 
 	"github.com/opentracing/opentracing-go"
+	"go.uber.org/zap"
+
 	"github.com/pingcap/kvproto/pkg/pdpb"
 	"github.com/pingcap/log"
+
 	"github.com/tikv/pd/client/errs"
 	"github.com/tikv/pd/client/metrics"
-	"go.uber.org/zap"
 )
 
 // GCClient is a client for doing GC

client/http/client.go

@@ -23,13 +23,15 @@ import (
 	"net/http"
 	"time"
 
+	"github.com/prometheus/client_golang/prometheus"
+	"go.uber.org/zap"
+
 	"github.com/pingcap/errors"
 	"github.com/pingcap/log"
-	"github.com/prometheus/client_golang/prometheus"
+
 	"github.com/tikv/pd/client/errs"
 	"github.com/tikv/pd/client/pkg/retry"
 	sd "github.com/tikv/pd/client/servicediscovery"
-	"go.uber.org/zap"
 )
 
 const (

client/http/client_test.go

@@ -23,6 +23,7 @@ import (
 	"time"
 
 	"github.com/stretchr/testify/require"
+
 	"github.com/tikv/pd/client/errs"
 	"github.com/tikv/pd/client/pkg/retry"
 )

client/http/interface.go

@@ -26,6 +26,7 @@ import (
 	"github.com/pingcap/kvproto/pkg/keyspacepb"
 	"github.com/pingcap/kvproto/pkg/metapb"
 	"github.com/pingcap/kvproto/pkg/pdpb"
+
 	"github.com/tikv/pd/client/pkg/retry"
 )
 

client/http/request_info.go

@@ -17,8 +17,9 @@ package http
 import (
 	"fmt"
 
-	"github.com/tikv/pd/client/pkg/retry"
 	"go.uber.org/zap"
+
+	"github.com/tikv/pd/client/pkg/retry"
 )
 
 // The following constants are the names of the requests.

client/http/types.go

@@ -22,6 +22,7 @@ import (
 	"github.com/pingcap/kvproto/pkg/encryptionpb"
 	"github.com/pingcap/kvproto/pkg/keyspacepb"
 	"github.com/pingcap/kvproto/pkg/pdpb"
+
 	pd "github.com/tikv/pd/client/clients/router"
 )
 

client/inner_client.go

@@ -6,20 +6,21 @@ import (
 	"sync"
 	"time"
 
+	"go.uber.org/zap"
+	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/status"
 
 	"github.com/pingcap/errors"
 	"github.com/pingcap/kvproto/pkg/pdpb"
 	"github.com/pingcap/log"
-	cb "github.com/tikv/pd/client/circuitbreaker"
+
 	"github.com/tikv/pd/client/clients/tso"
 	"github.com/tikv/pd/client/errs"
 	"github.com/tikv/pd/client/metrics"
 	"github.com/tikv/pd/client/opt"
+	cb "github.com/tikv/pd/client/pkg/circuitbreaker"
 	sd "github.com/tikv/pd/client/servicediscovery"
-	"go.uber.org/zap"
-	"google.golang.org/grpc"
-	"google.golang.org/grpc/status"
 )
 
 const (

client/keyspace_client.go

@@ -19,8 +19,10 @@ import (
 	"time"
 
 	"github.com/opentracing/opentracing-go"
+
 	"github.com/pingcap/errors"
 	"github.com/pingcap/kvproto/pkg/keyspacepb"
+
 	"github.com/tikv/pd/client/errs"
 	"github.com/tikv/pd/client/metrics"
 )