gomod: update the pd client for release-7.1 (pingcap#49342)

close tikv/pd#7509

DEPS.bzl

@@ -4179,8 +4179,8 @@ def go_deps():
  name = "com_github_tikv_client_go_v2",
  build_file_proto_mode = "disable_global",
  importpath = "github.com/tikv/client-go/v2",
- sum = "h1:5M68i8eHvDtlGO73pizpVGbhn9/GaoPfjd4djv+vsEU=",
- version = "v2.0.8-0.20231208132725-106bf1992ddf",
+ sum = "h1:MuTNChL77sMvCvtOuGhuU/u1YBaSDPfqnO6roUCKwOA=",
+ version = "v2.0.8-0.20231211100325-d44bb7f9cb9e",
  )
  go_repository(
  name = "com_github_tikv_pd",
@@ -4194,8 +4194,8 @@ def go_deps():
  name = "com_github_tikv_pd_client",
  build_file_proto_mode = "disable_global",
  importpath = "github.com/tikv/pd/client",
- sum = "h1:pKIvLrqEmTMw+J8wwdv4r2QTp+cjW9giiOIyaRy9mLM=",
- version = "v0.0.0-20230905092614-113cdedbebb6",
+ sum = "h1:BBwUZAaBl7DKdyaduOxXqias4xCtdDgIAGsDBuri3lg=",
+ version = "v0.0.0-20231211083919-fe6fd1721aa6",
  )
  go_repository(
  name = "com_github_timakin_bodyclose",
@@ -5982,8 +5982,8 @@ def go_deps():
  name = "org_golang_x_crypto",
  build_file_proto_mode = "disable_global",
  importpath = "golang.org/x/crypto",
- sum = "h1:pd9TJtTueMTVQXzk8E2XESSMQDj/U7OUu0PqJqPXQjQ=",
- version = "v0.8.0",
+ sum = "h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc=",
+ version = "v0.14.0",
  )
  go_repository(
  name = "org_golang_x_exp",
@@ -6032,8 +6032,8 @@ def go_deps():
  name = "org_golang_x_net",
  build_file_proto_mode = "disable_global",
  importpath = "golang.org/x/net",
- sum = "h1:X2//UzNDwYmtCLn7To6G58Wr6f5ahEAQgKNzv9Y951M=",
- version = "v0.10.0",
+ sum = "h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM=",
+ version = "v0.17.0",
  )
  go_repository(
  name = "org_golang_x_oauth2",
@@ -6053,22 +6053,22 @@ def go_deps():
  name = "org_golang_x_sys",
  build_file_proto_mode = "disable_global",
  importpath = "golang.org/x/sys",
- sum = "h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU=",
- version = "v0.8.0",
+ sum = "h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=",
+ version = "v0.13.0",
  )
  go_repository(
  name = "org_golang_x_term",
  build_file_proto_mode = "disable_global",
  importpath = "golang.org/x/term",
- sum = "h1:n5xxQn2i3PC0yLAbjTpNT85q/Kgzcr2gIoX9OrJUols=",
- version = "v0.8.0",
+ sum = "h1:bb+I9cTfFazGW51MZqBVmZy7+JEJMouUHTUSKVQLBek=",
+ version = "v0.13.0",
  )
  go_repository(
  name = "org_golang_x_text",
  build_file_proto_mode = "disable_global",
  importpath = "golang.org/x/text",
- sum = "h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE=",
- version = "v0.9.0",
+ sum = "h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=",
+ version = "v0.13.0",
  )
  go_repository(
  name = "org_golang_x_time",

domain/infosync/BUILD.bazel

@@ -43,6 +43,7 @@ go_library(
  "@com_github_pingcap_errors//:errors",
  "@com_github_pingcap_failpoint//:failpoint",
  "@com_github_pingcap_kvproto//pkg/kvrpcpb",
+ "@com_github_pingcap_kvproto//pkg/meta_storagepb",
  "@com_github_pingcap_kvproto//pkg/metapb",
  "@com_github_pingcap_kvproto//pkg/resource_manager",
  "@com_github_pingcap_log//:log",

domain/infosync/resource_group_manager.go

@@ -20,6 +20,7 @@ import (
  "math"
  "sync"
 
+ "github.com/pingcap/kvproto/pkg/meta_storagepb"
  rmpb "github.com/pingcap/kvproto/pkg/resource_manager"
  pd "github.com/tikv/pd/client"
 )
@@ -103,3 +104,11 @@ func (m *mockResourceGroupManager) AcquireTokenBuckets(ctx context.Context, requ
 func (m *mockResourceGroupManager) WatchResourceGroup(ctx context.Context, revision int64) (chan []*rmpb.ResourceGroup, error) {
  return nil, nil
 }
+
+func (m *mockResourceGroupManager) LoadResourceGroups(ctx context.Context) ([]*rmpb.ResourceGroup, int64, error) {
+ return nil, 0, nil
+}
+
+func (m *mockResourceGroupManager) Watch(ctx context.Context, key []byte, opts ...pd.OpOption) (chan []*meta_storagepb.Event, error) {
+ return nil, nil
+}

executor/BUILD.bazel

@@ -448,6 +448,7 @@ go_test(
  "@com_github_pingcap_fn//:fn",
  "@com_github_pingcap_kvproto//pkg/diagnosticspb",
  "@com_github_pingcap_kvproto//pkg/kvrpcpb",
+ "@com_github_pingcap_kvproto//pkg/meta_storagepb",
  "@com_github_pingcap_kvproto//pkg/metapb",
  "@com_github_pingcap_log//:log",
  "@com_github_pingcap_sysutil//:sysutil",

executor/calibrate_resource_test.go

@@ -15,6 +15,7 @@
 package executor_test
 
 import (
+ "bytes"
  "context"
  "encoding/base64"
  "encoding/json"
@@ -23,6 +24,7 @@ import (
 
  "github.com/pingcap/errors"
  "github.com/pingcap/failpoint"
+ "github.com/pingcap/kvproto/pkg/meta_storagepb"
  "github.com/pingcap/tidb/executor"
  "github.com/pingcap/tidb/parser/mysql"
  "github.com/pingcap/tidb/testkit"
@@ -59,7 +61,7 @@ func TestCalibrateResource(t *testing.T) {
  }()
 
  mockPrivider := &mockResourceGroupProvider{
- cfg: rmclient.ControllerConfig{
+ cfg: rmclient.Config{
  RequestUnit: rmclient.RequestUnitConfig{
  ReadBaseCost: 0.25,
  ReadCostPerByte: 0.0000152587890625,
@@ -576,16 +578,21 @@ tikv_server_cpu_cores_quota 8
 
 type mockResourceGroupProvider struct {
  rmclient.ResourceGroupProvider
- cfg rmclient.ControllerConfig
+ cfg rmclient.Config
 }
 
-func (p *mockResourceGroupProvider) LoadGlobalConfig(ctx context.Context, names []string, configPath string) ([]pd.GlobalConfigItem, int64, error) {
- if configPath != "resource_group/controller" {
- return nil, 0, errors.New("unsupported configPath")
+func (p *mockResourceGroupProvider) Get(ctx context.Context, key []byte, opts ...pd.OpOption) (*meta_storagepb.GetResponse, error) {
+ if !bytes.Equal(pd.ControllerConfigPathPrefixBytes, key) {
+ return nil, errors.New("unsupported configPath")
  }
  payload, _ := json.Marshal(&p.cfg)
- item := pd.GlobalConfigItem{
- PayLoad: payload,
- }
- return []pd.GlobalConfigItem{item}, 0, nil
+ return &meta_storagepb.GetResponse{
+ Count: 1,
+ Kvs: []*meta_storagepb.KeyValue{
+ {
+ Key: key,
+ Value: payload,
+ },
+ },
+ }, nil
 }

go.mod

@@ -94,8 +94,8 @@ require (
  github.com/stretchr/testify v1.8.2
  github.com/tdakkota/asciicheck v0.2.0
  github.com/tiancaiamao/appdash v0.0.0-20181126055449-889f96f722a2
- github.com/tikv/client-go/v2 v2.0.8-0.20231208132725-106bf1992ddf
- github.com/tikv/pd/client v0.0.0-20230905092614-113cdedbebb6
+ github.com/tikv/client-go/v2 v2.0.8-0.20231211100325-d44bb7f9cb9e
+ github.com/tikv/pd/client v0.0.0-20231211083919-fe6fd1721aa6
  github.com/timakin/bodyclose v0.0.0-20221125081123-e39cf3fc478e
  github.com/twmb/murmur3 v1.1.6
  github.com/uber/jaeger-client-go v2.22.1+incompatible
@@ -115,12 +115,12 @@ require (
  go.uber.org/multierr v1.11.0
  go.uber.org/zap v1.24.0
  golang.org/x/exp v0.0.0-20221023144134-a1e5550cf13e
- golang.org/x/net v0.10.0
+ golang.org/x/net v0.17.0
  golang.org/x/oauth2 v0.7.0
  golang.org/x/sync v0.2.0
- golang.org/x/sys v0.8.0
- golang.org/x/term v0.8.0
- golang.org/x/text v0.9.0
+ golang.org/x/sys v0.13.0
+ golang.org/x/term v0.13.0
+ golang.org/x/text v0.13.0
  golang.org/x/time v0.3.0
  golang.org/x/tools v0.9.1
  google.golang.org/api v0.114.0
@@ -270,7 +270,7 @@ require (
  go.opentelemetry.io/otel/sdk/metric v0.20.0 // indirect
  go.opentelemetry.io/otel/trace v0.20.0 // indirect
  go.opentelemetry.io/proto/otlp v0.7.0 // indirect
- golang.org/x/crypto v0.8.0 // indirect
+ golang.org/x/crypto v0.14.0 // indirect
  golang.org/x/exp/typeparams v0.0.0-20230224173230-c95f2b4c22f2 // indirect
  golang.org/x/mod v0.10.0 // indirect
  golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect

go.sum

@@ -963,10 +963,10 @@ github.com/tiancaiamao/appdash v0.0.0-20181126055449-889f96f722a2 h1:mbAskLJ0oJf
 github.com/tiancaiamao/appdash v0.0.0-20181126055449-889f96f722a2/go.mod h1:2PfKggNGDuadAa0LElHrByyrz4JPZ9fFx6Gs7nx7ZZU=
 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/client-go/v2 v2.0.8-0.20231208132725-106bf1992ddf h1:5M68i8eHvDtlGO73pizpVGbhn9/GaoPfjd4djv+vsEU=
-github.com/tikv/client-go/v2 v2.0.8-0.20231208132725-106bf1992ddf/go.mod h1:tXip3uaG8miN+BWvD1os8aczFM++vGQx2DerDD4zrvQ=
-github.com/tikv/pd/client v0.0.0-20230905092614-113cdedbebb6 h1:pKIvLrqEmTMw+J8wwdv4r2QTp+cjW9giiOIyaRy9mLM=
-github.com/tikv/pd/client v0.0.0-20230905092614-113cdedbebb6/go.mod h1:5vgcvO020ZCdMZkTrRdS/wFZQUab82BSfKE38T61ro0=
+github.com/tikv/client-go/v2 v2.0.8-0.20231211100325-d44bb7f9cb9e h1:MuTNChL77sMvCvtOuGhuU/u1YBaSDPfqnO6roUCKwOA=
+github.com/tikv/client-go/v2 v2.0.8-0.20231211100325-d44bb7f9cb9e/go.mod h1:45NuHB8x+VAoztMIjF6hEgXvPQXhXWPfMxDg0N8CoRY=
+github.com/tikv/pd/client v0.0.0-20231211083919-fe6fd1721aa6 h1:BBwUZAaBl7DKdyaduOxXqias4xCtdDgIAGsDBuri3lg=
+github.com/tikv/pd/client v0.0.0-20231211083919-fe6fd1721aa6/go.mod h1:8XEP9aqUvvc9guWJZ7vo0av0H6QsJtjIrOmLAQlL2Jo=
 github.com/timakin/bodyclose v0.0.0-20221125081123-e39cf3fc478e h1:MV6KaVu/hzByHP0UvJ4HcMGE/8a6A4Rggc/0wx2AvJo=
 github.com/timakin/bodyclose v0.0.0-20221125081123-e39cf3fc478e/go.mod h1:27bSVNWSBOHm+qRp1T9qzaIpsWEP6TbUnei/43HK+PQ=
 github.com/tklauser/go-sysconf v0.3.9/go.mod h1:11DU/5sG7UexIrp/O6g35hrWzu0JxlwQ3LSFUzyeuhs=
@@ -1120,8 +1120,8 @@ golang.org/x/crypto v0.0.0-20220427172511-eb4f295cb31f/go.mod h1:IxCIyHEi3zRg3s0
 golang.org/x/crypto v0.0.0-20220518034528-6f7dac969898/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw=
 golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU=
-golang.org/x/crypto v0.8.0 h1:pd9TJtTueMTVQXzk8E2XESSMQDj/U7OUu0PqJqPXQjQ=
-golang.org/x/crypto v0.8.0/go.mod h1:mRqEX+O9/h5TFCrQhkgjo2yKi0yYA+9ecGkdQoHrywE=
+golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc=
+golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4=
 golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
@@ -1224,8 +1224,8 @@ golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug
 golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco=
 golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
 golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
-golang.org/x/net v0.10.0 h1:X2//UzNDwYmtCLn7To6G58Wr6f5ahEAQgKNzv9Y951M=
-golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
+golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM=
+golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -1326,15 +1326,15 @@ golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU=
-golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
+golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
 golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U=
-golang.org/x/term v0.8.0 h1:n5xxQn2i3PC0yLAbjTpNT85q/Kgzcr2gIoX9OrJUols=
-golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
+golang.org/x/term v0.13.0 h1:bb+I9cTfFazGW51MZqBVmZy7+JEJMouUHTUSKVQLBek=
+golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -1346,8 +1346,8 @@ golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
-golang.org/x/text v0.9.0 h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE=
-golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
+golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=
+golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
 golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=

store/driver/tikv_driver.go

@@ -106,7 +106,7 @@ func TrySetupGlobalResourceController(ctx context.Context, serverID uint64, s kv
  return errors.New("cannot setup up resource controller, should use tikv storage")
  }
 
- control, err := rmclient.NewResourceGroupController(ctx, serverID, store.GetPDClient(), nil, rmclient.WithMaxWaitDuration(time.Second*30))
+ control, err := rmclient.NewResourceGroupController(ctx, serverID, store.GetPDClient(), nil)
  if err != nil {
  return err
  }

store/mockstore/unistore/pd.go

@@ -263,6 +263,10 @@ func (c *pdClient) WatchResourceGroup(ctx context.Context, revision int64) (chan
  return nil, nil
 }
 
+func (c *pdClient) LoadResourceGroups(ctx context.Context) ([]*rmpb.ResourceGroup, int64, error) {
+ return nil, 0, nil
+}
+
 func (c *pdClient) AcquireTokenBuckets(ctx context.Context, request *rmpb.TokenBucketsRequest) ([]*rmpb.TokenBucketResponse, error) {
  return nil, nil
 }