Refine the init method of PD HTTP client (#1058)

Signed-off-by: JmPotato <[email protected]>
tikv · Nov 14, 2023 · 8fc8a52 · 8fc8a52
1 parent 9caddec
commit 8fc8a52
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 15 deletions.
diff --git a/go.mod b/go.mod
@@ -21,7 +21,7 @@ require (
 	github.com/prometheus/client_model v0.3.0
 	github.com/stretchr/testify v1.8.2
 	github.com/tiancaiamao/gp v0.0.0-20221230034425-4025bc8a4d4a
-	github.com/tikv/pd/client v0.0.0-20231113054113-7dbe6079ca2f
+	github.com/tikv/pd/client v0.0.0-20231114041114-86831ce71865
 	github.com/twmb/murmur3 v1.1.3
 	go.etcd.io/etcd/api/v3 v3.5.10
 	go.etcd.io/etcd/client/v3 v3.5.10

diff --git a/go.sum b/go.sum
@@ -112,8 +112,8 @@ github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ
 github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
 github.com/tiancaiamao/gp v0.0.0-20221230034425-4025bc8a4d4a h1:J/YdBZ46WKpXsxsW93SG+q0F8KI+yFrcIDT4c/RNoc4=
 github.com/tiancaiamao/gp v0.0.0-20221230034425-4025bc8a4d4a/go.mod h1:h4xBhSNtOeEosLJ4P7JyKXX7Cabg7AVkWCK5gV2vOrM=
-github.com/tikv/pd/client v0.0.0-20231113054113-7dbe6079ca2f h1:DwMOkPfUf9euj/7I25r2d7/NJxneZ/BjnA7vRnD6/cg=
-github.com/tikv/pd/client v0.0.0-20231113054113-7dbe6079ca2f/go.mod h1:cd6zBqRM9aogxf26K8NnFRPVtq9BnRE59tKEpX8IaWQ=
+github.com/tikv/pd/client v0.0.0-20231114041114-86831ce71865 h1:Gkvo77EevOpBGIdV1c8gwRqPhVbgLPRy82tXNEFpGTc=
+github.com/tikv/pd/client v0.0.0-20231114041114-86831ce71865/go.mod h1:cd6zBqRM9aogxf26K8NnFRPVtq9BnRE59tKEpX8IaWQ=
 github.com/twmb/murmur3 v1.1.3 h1:D83U0XYKcHRYwYIpBKf3Pks91Z0Byda/9SJ8B6EMRcA=
 github.com/twmb/murmur3 v1.1.3/go.mod h1:Qq/R7NUyOfr65zD+6Q5IHKsJLwP7exErjN6lyyq3OSQ=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=

diff --git a/integration_tests/go.mod b/integration_tests/go.mod
@@ -12,7 +12,7 @@ require (
 	github.com/stretchr/testify v1.8.4
 	github.com/tidwall/gjson v1.14.1
 	github.com/tikv/client-go/v2 v2.0.8-0.20231025022411-cad314220659
-	github.com/tikv/pd/client v0.0.0-20231113054113-7dbe6079ca2f
+	github.com/tikv/pd/client v0.0.0-20231114041114-86831ce71865
 	go.uber.org/goleak v1.2.1
 )
 

diff --git a/integration_tests/go.sum b/integration_tests/go.sum
@@ -507,8 +507,8 @@ github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA=
 github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=
 github.com/tidwall/pretty v1.2.0 h1:RWIZEg2iJ8/g6fDDYzMpobmaoGh5OLl4AXtGUGPcqCs=
 github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=
-github.com/tikv/pd/client v0.0.0-20231113054113-7dbe6079ca2f h1:DwMOkPfUf9euj/7I25r2d7/NJxneZ/BjnA7vRnD6/cg=
-github.com/tikv/pd/client v0.0.0-20231113054113-7dbe6079ca2f/go.mod h1:cd6zBqRM9aogxf26K8NnFRPVtq9BnRE59tKEpX8IaWQ=
+github.com/tikv/pd/client v0.0.0-20231114041114-86831ce71865 h1:Gkvo77EevOpBGIdV1c8gwRqPhVbgLPRy82tXNEFpGTc=
+github.com/tikv/pd/client v0.0.0-20231114041114-86831ce71865/go.mod h1:cd6zBqRM9aogxf26K8NnFRPVtq9BnRE59tKEpX8IaWQ=
 github.com/tklauser/go-sysconf v0.3.9/go.mod h1:11DU/5sG7UexIrp/O6g35hrWzu0JxlwQ3LSFUzyeuhs=
 github.com/tklauser/go-sysconf v0.3.11 h1:89WgdJhk5SNwJfu+GKyYveZ4IaJ7xAkecBo+KdJV0CM=
 github.com/tklauser/go-sysconf v0.3.11/go.mod h1:GqXfhXY3kiPa0nAXPDIQIWzJbMCB7AmcWpGR8lSZfqI=

diff --git a/integration_tests/pd_api_test.go b/integration_tests/pd_api_test.go
@@ -55,8 +55,7 @@ func (s *apiTestSuite) SetupTest() {
 	rpcClient := tikv.NewRPCClient()
 	require.NoError(failpoint.Enable("tikvclient/mockFastSafeTSUpdater", `return()`))
 	// Set PD HTTP client.
-	s.store, err = tikv.NewTestTiKVStore(rpcClient, pdClient, nil, nil, 0,
-		tikv.WithPDHTTPClient(addrs, nil, nil, nil))
+	s.store, err = tikv.NewTestTiKVStore(rpcClient, pdClient, nil, nil, 0, tikv.WithPDHTTPClient(addrs))
 	require.NoError(err)
 	storeID := uint64(1)
 	s.store.GetRegionCache().SetRegionCacheStore(storeID, s.storeAddr(storeID), s.storeAddr(storeID), tikvrpc.TiKV, 1, nil)

diff --git a/tikv/kv.go b/tikv/kv.go
@@ -48,7 +48,6 @@ import (
 	"github.com/opentracing/opentracing-go"
 	"github.com/pingcap/kvproto/pkg/kvrpcpb"
 	"github.com/pkg/errors"
-	"github.com/prometheus/client_golang/prometheus"
 	"github.com/tikv/client-go/v2/config"
 	tikverr "github.com/tikv/client-go/v2/error"
 	"github.com/tikv/client-go/v2/internal/client"
@@ -198,18 +197,15 @@ func WithPool(gp Pool) Option {
 	}
 }
 
-// WithPDHTTPClient set the PD HTTP client with the given address and TLS config.
+// WithPDHTTPClient sets the PD HTTP client with the given PD addresses and options.
 func WithPDHTTPClient(
 	pdAddrs []string,
-	tlsConf *tls.Config,
-	requestCounter *prometheus.CounterVec,
-	executionDuration *prometheus.HistogramVec,
+	opts ...pdhttp.ClientOption,
 ) Option {
 	return func(o *KVStore) {
 		o.pdHttpClient = pdhttp.NewClient(
 			pdAddrs,
-			pdhttp.WithTLSConfig(tlsConf),
-			pdhttp.WithMetrics(requestCounter, executionDuration),
+			opts...,
 		)
 	}
 }