Skip to content

Commit f8532d5

Browse files
nolouchti-chi-bot
nolouch
authored and
ti-chi-bot
committed
This is an automated cherry-pick of pingcap#54424
Signed-off-by: ti-chi-bot <[email protected]>
1 parent 4c7f6a1 commit f8532d5

File tree

4 files changed

+36
-10
lines changed

4 files changed

+36
-10
lines changed

‎DEPS.bzl

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7054,13 +7054,23 @@ def go_deps():
70547054
name = "com_github_tikv_pd_client",
70557055
build_file_proto_mode = "disable_global",
70567056
importpath = "github.com/tikv/pd/client",
7057+
<<<<<<< HEAD
70577058
sha256 = "52835e32218c5458c33836b794f73d2bb0ad37576d4550c85044c52cdb84e434",
70587059
strip_prefix = "github.com/tikv/pd/[email protected]",
70597060
urls = [
70607061
"http://bazel-cache.pingcap.net:8080/gomod/github.com/tikv/pd/client/com_github_tikv_pd_client-v0.0.0-20240528122050-634e05a87ee0.zip",
70617062
"http://ats.apps.svc/gomod/github.com/tikv/pd/client/com_github_tikv_pd_client-v0.0.0-20240528122050-634e05a87ee0.zip",
70627063
"https://cache.hawkingrei.com/gomod/github.com/tikv/pd/client/com_github_tikv_pd_client-v0.0.0-20240528122050-634e05a87ee0.zip",
70637064
"https://storage.googleapis.com/pingcapmirror/gomod/github.com/tikv/pd/client/com_github_tikv_pd_client-v0.0.0-20240528122050-634e05a87ee0.zip",
7065+
=======
7066+
sha256 = "af957cdaccb24818d126f992ff3677b04adb2e80b53b898d5bab6f134a144120",
7067+
strip_prefix = "github.com/tikv/pd/[email protected]",
7068+
urls = [
7069+
"http://bazel-cache.pingcap.net:8080/gomod/github.com/tikv/pd/client/com_github_tikv_pd_client-v0.0.0-20240703065657-6b25787aff4d.zip",
7070+
"http://ats.apps.svc/gomod/github.com/tikv/pd/client/com_github_tikv_pd_client-v0.0.0-20240703065657-6b25787aff4d.zip",
7071+
"https://cache.hawkingrei.com/gomod/github.com/tikv/pd/client/com_github_tikv_pd_client-v0.0.0-20240703065657-6b25787aff4d.zip",
7072+
"https://storage.googleapis.com/pingcapmirror/gomod/github.com/tikv/pd/client/com_github_tikv_pd_client-v0.0.0-20240703065657-6b25787aff4d.zip",
7073+
>>>>>>> 9f7441a9794 (mod: update pd client (#54424))
70647074
],
70657075
)
70667076
go_repository(

‎go.mod

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,9 +104,16 @@ require (
104104
github.com/stretchr/testify v1.8.4
105105
github.com/tdakkota/asciicheck v0.2.0
106106
github.com/tiancaiamao/appdash v0.0.0-20181126055449-889f96f722a2
107+
<<<<<<< HEAD
107108
github.com/tikv/client-go/v2 v2.0.8-0.20240531122021-7a74511a5241
108109
github.com/tikv/pd/client v0.0.0-20240528122050-634e05a87ee0
109110
github.com/timakin/bodyclose v0.0.0-20230421092635-574207250966
111+
=======
112+
github.com/tidwall/btree v1.7.0
113+
github.com/tikv/client-go/v2 v2.0.8-0.20240703095801-d73cc1ed6503
114+
github.com/tikv/pd/client v0.0.0-20240703065657-6b25787aff4d
115+
github.com/timakin/bodyclose v0.0.0-20240125160201-f835fa56326a
116+
>>>>>>> 9f7441a9794 (mod: update pd client (#54424))
110117
github.com/twmb/murmur3 v1.1.6
111118
github.com/uber/jaeger-client-go v2.22.1+incompatible
112119
github.com/vbauerster/mpb/v7 v7.5.3

‎go.sum

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -993,12 +993,23 @@ github.com/tiancaiamao/appdash v0.0.0-20181126055449-889f96f722a2 h1:mbAskLJ0oJf
993993
github.com/tiancaiamao/appdash v0.0.0-20181126055449-889f96f722a2/go.mod h1:2PfKggNGDuadAa0LElHrByyrz4JPZ9fFx6Gs7nx7ZZU=
994994
github.com/tiancaiamao/gp v0.0.0-20221230034425-4025bc8a4d4a h1:J/YdBZ46WKpXsxsW93SG+q0F8KI+yFrcIDT4c/RNoc4=
995995
github.com/tiancaiamao/gp v0.0.0-20221230034425-4025bc8a4d4a/go.mod h1:h4xBhSNtOeEosLJ4P7JyKXX7Cabg7AVkWCK5gV2vOrM=
996+
<<<<<<< HEAD
996997
github.com/tikv/client-go/v2 v2.0.8-0.20240531122021-7a74511a5241 h1:iwqchfXkd1pfUDSnCKxXAeaR7FzyHA+yRdr5PtTwvvg=
997998
github.com/tikv/client-go/v2 v2.0.8-0.20240531122021-7a74511a5241/go.mod h1:37p0ryKaieJbBpVDWnaPi2ZS6UFqkgpsemBLkGX2FvM=
998999
github.com/tikv/pd/client v0.0.0-20240528122050-634e05a87ee0 h1:7Pn6IykTelkKVhdzj2kbrYxj8DTModJt+U+7HTeIb54=
9991000
github.com/tikv/pd/client v0.0.0-20240528122050-634e05a87ee0/go.mod h1:AwjTSpM7CgAynYwB6qTG5R5fVC9/eXlQXiTO6zDL1HI=
10001001
github.com/timakin/bodyclose v0.0.0-20230421092635-574207250966 h1:quvGphlmUVU+nhpFa4gg4yJyTRJ13reZMDHrKwYw53M=
10011002
github.com/timakin/bodyclose v0.0.0-20230421092635-574207250966/go.mod h1:27bSVNWSBOHm+qRp1T9qzaIpsWEP6TbUnei/43HK+PQ=
1003+
=======
1004+
github.com/tidwall/btree v1.7.0 h1:L1fkJH/AuEh5zBnnBbmTwQ5Lt+bRJ5A8EWecslvo9iI=
1005+
github.com/tidwall/btree v1.7.0/go.mod h1:twD9XRA5jj9VUQGELzDO4HPQTNJsoWWfYEL+EUQ2cKY=
1006+
github.com/tikv/client-go/v2 v2.0.8-0.20240703095801-d73cc1ed6503 h1:0mUlg3+dA5LvwKs1U6i/ID/8RsYgLVLGyM8fSBMb630=
1007+
github.com/tikv/client-go/v2 v2.0.8-0.20240703095801-d73cc1ed6503/go.mod h1:4HDOAx8OXAJPtqhCZ03IhChXgaFs4B3+vSrPWmiPxjg=
1008+
github.com/tikv/pd/client v0.0.0-20240703065657-6b25787aff4d h1:iTvGLERJltVzl/+W2e2nIpLgmymzMXK4VJW/HVl15ps=
1009+
github.com/tikv/pd/client v0.0.0-20240703065657-6b25787aff4d/go.mod h1:EHHidLItrJGh0jqfdfFhIHG5vwkR8+43tFnp7v7iv1Q=
1010+
github.com/timakin/bodyclose v0.0.0-20240125160201-f835fa56326a h1:A6uKudFIfAEpoPdaal3aSqGxBzLyU8TqyXImLwo6dIo=
1011+
github.com/timakin/bodyclose v0.0.0-20240125160201-f835fa56326a/go.mod h1:mkjARE7Yr8qU23YcGMSALbIxTQ9r9QBVahQOBRfU460=
1012+
>>>>>>> 9f7441a9794 (mod: update pd client (#54424))
10021013
github.com/tklauser/go-sysconf v0.3.9/go.mod h1:11DU/5sG7UexIrp/O6g35hrWzu0JxlwQ3LSFUzyeuhs=
10031014
github.com/tklauser/go-sysconf v0.3.11 h1:89WgdJhk5SNwJfu+GKyYveZ4IaJ7xAkecBo+KdJV0CM=
10041015
github.com/tklauser/go-sysconf v0.3.11/go.mod h1:GqXfhXY3kiPa0nAXPDIQIWzJbMCB7AmcWpGR8lSZfqI=

‎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)