Skip to content

Commit 821e491

Browse files
authored
mod: update pd client (#54424) (#54461)
ref tikv/pd#8349, ref #47421
1 parent 1b84f38 commit 821e491

File tree

4 files changed

+17
-19
lines changed

4 files changed

+17
-19
lines changed

DEPS.bzl

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7193,13 +7193,13 @@ def go_deps():
71937193
name = "com_github_tikv_pd_client",
71947194
build_file_proto_mode = "disable_global",
71957195
importpath = "github.com/tikv/pd/client",
7196-
sha256 = "107218d0f9404ed51c23fda05b4fdac1bd3dbe8c8724c63ceddb4cbc7e77ceaf",
7197-
strip_prefix = "github.com/tikv/pd/[email protected]20240620115049-049de1761e56",
7196+
sha256 = "af957cdaccb24818d126f992ff3677b04adb2e80b53b898d5bab6f134a144120",
7197+
strip_prefix = "github.com/tikv/pd/[email protected]20240703065657-6b25787aff4d",
71987198
urls = [
7199-
"http://bazel-cache.pingcap.net:8080/gomod/github.com/tikv/pd/client/com_github_tikv_pd_client-v0.0.0-20240620115049-049de1761e56.zip",
7200-
"http://ats.apps.svc/gomod/github.com/tikv/pd/client/com_github_tikv_pd_client-v0.0.0-20240620115049-049de1761e56.zip",
7201-
"https://cache.hawkingrei.com/gomod/github.com/tikv/pd/client/com_github_tikv_pd_client-v0.0.0-20240620115049-049de1761e56.zip",
7202-
"https://storage.googleapis.com/pingcapmirror/gomod/github.com/tikv/pd/client/com_github_tikv_pd_client-v0.0.0-20240620115049-049de1761e56.zip",
7199+
"http://bazel-cache.pingcap.net:8080/gomod/github.com/tikv/pd/client/com_github_tikv_pd_client-v0.0.0-20240703065657-6b25787aff4d.zip",
7200+
"http://ats.apps.svc/gomod/github.com/tikv/pd/client/com_github_tikv_pd_client-v0.0.0-20240703065657-6b25787aff4d.zip",
7201+
"https://cache.hawkingrei.com/gomod/github.com/tikv/pd/client/com_github_tikv_pd_client-v0.0.0-20240703065657-6b25787aff4d.zip",
7202+
"https://storage.googleapis.com/pingcapmirror/gomod/github.com/tikv/pd/client/com_github_tikv_pd_client-v0.0.0-20240703065657-6b25787aff4d.zip",
72037203
],
72047204
)
72057205
go_repository(

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ require (
108108
github.com/tiancaiamao/appdash v0.0.0-20181126055449-889f96f722a2
109109
github.com/tidwall/btree v1.7.0
110110
github.com/tikv/client-go/v2 v2.0.8-0.20240703095801-d73cc1ed6503
111-
github.com/tikv/pd/client v0.0.0-20240620115049-049de1761e56
111+
github.com/tikv/pd/client v0.0.0-20240703065657-6b25787aff4d
112112
github.com/timakin/bodyclose v0.0.0-20240125160201-f835fa56326a
113113
github.com/twmb/murmur3 v1.1.6
114114
github.com/uber/jaeger-client-go v2.22.1+incompatible

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -848,8 +848,8 @@ github.com/tidwall/btree v1.7.0 h1:L1fkJH/AuEh5zBnnBbmTwQ5Lt+bRJ5A8EWecslvo9iI=
848848
github.com/tidwall/btree v1.7.0/go.mod h1:twD9XRA5jj9VUQGELzDO4HPQTNJsoWWfYEL+EUQ2cKY=
849849
github.com/tikv/client-go/v2 v2.0.8-0.20240703095801-d73cc1ed6503 h1:0mUlg3+dA5LvwKs1U6i/ID/8RsYgLVLGyM8fSBMb630=
850850
github.com/tikv/client-go/v2 v2.0.8-0.20240703095801-d73cc1ed6503/go.mod h1:4HDOAx8OXAJPtqhCZ03IhChXgaFs4B3+vSrPWmiPxjg=
851-
github.com/tikv/pd/client v0.0.0-20240620115049-049de1761e56 h1:7TLLfwrKoty9UeJMsSopRTXYw8ooxcF0Z1fegXhIgks=
852-
github.com/tikv/pd/client v0.0.0-20240620115049-049de1761e56/go.mod h1:EHHidLItrJGh0jqfdfFhIHG5vwkR8+43tFnp7v7iv1Q=
851+
github.com/tikv/pd/client v0.0.0-20240703065657-6b25787aff4d h1:iTvGLERJltVzl/+W2e2nIpLgmymzMXK4VJW/HVl15ps=
852+
github.com/tikv/pd/client v0.0.0-20240703065657-6b25787aff4d/go.mod h1:EHHidLItrJGh0jqfdfFhIHG5vwkR8+43tFnp7v7iv1Q=
853853
github.com/timakin/bodyclose v0.0.0-20240125160201-f835fa56326a h1:A6uKudFIfAEpoPdaal3aSqGxBzLyU8TqyXImLwo6dIo=
854854
github.com/timakin/bodyclose v0.0.0-20240125160201-f835fa56326a/go.mod h1:mkjARE7Yr8qU23YcGMSALbIxTQ9r9QBVahQOBRfU460=
855855
github.com/tklauser/go-sysconf v0.3.9/go.mod h1:11DU/5sG7UexIrp/O6g35hrWzu0JxlwQ3LSFUzyeuhs=

pkg/executor/internal/calibrateresource/calibrate_resource_test.go

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -54,17 +54,15 @@ func TestCalibrateResource(t *testing.T) {
5454
defer func() {
5555
do.SetResourceGroupsController(oldResourceCtl)
5656
}()
57-
57+
// changed in 7.5 (ref https://github.com/tikv/pd/pull/6538), but for test pass, use the old config
58+
oldCfg := rmclient.DefaultConfig()
59+
oldCfg.RequestUnit.ReadBaseCost = 0.25
60+
oldCfg.RequestUnit.ReadCostPerByte = 0.0000152587890625
61+
oldCfg.RequestUnit.WriteBaseCost = 1.0
62+
oldCfg.RequestUnit.WriteCostPerByte = 0.0009765625
63+
oldCfg.RequestUnit.CPUMsCost = 0.3333333333333333
5864
mockPrivider := &mockResourceGroupProvider{
59-
cfg: rmclient.Config{
60-
RequestUnit: rmclient.RequestUnitConfig{
61-
ReadBaseCost: 0.25,
62-
ReadCostPerByte: 0.0000152587890625,
63-
WriteBaseCost: 1.0,
64-
WriteCostPerByte: 0.0009765625,
65-
CPUMsCost: 0.3333333333333333,
66-
},
67-
},
65+
cfg: *oldCfg,
6866
}
6967
resourceCtl, err := rmclient.NewResourceGroupController(context.Background(), 1, mockPrivider, nil)
7068
require.NoError(t, err)

0 commit comments

Comments
 (0)