diff --git a/DEPS.bzl b/DEPS.bzl index 403a9153205a4..a8afa80591ba0 100644 --- a/DEPS.bzl +++ b/DEPS.bzl @@ -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:BBwUZAaBl7DKdyaduOxXqias4xCtdDgIAGsDBuri3lg=", - version = "v0.0.0-20231211083919-fe6fd1721aa6", + sum = "h1:YAgGB92AiNCZdM5a65vdnJRX+gS+cc4OcUplWEU6O4w=", + version = "v0.0.0-20240708075102-05207d6819fb", ) go_repository( name = "com_github_timakin_bodyclose", diff --git a/executor/calibrate_resource_test.go b/executor/calibrate_resource_test.go index 6d89542591501..c8ca65fda8d90 100644 --- a/executor/calibrate_resource_test.go +++ b/executor/calibrate_resource_test.go @@ -59,17 +59,15 @@ func TestCalibrateResource(t *testing.T) { defer func() { executor.SetResourceGroupController(oldResourceCtl) }() - + // changed in 7.5 (ref https://github.com/tikv/pd/pull/6538), but for test pass, use the old config + oldCfg := rmclient.DefaultConfig() + oldCfg.RequestUnit.ReadBaseCost = 0.25 + oldCfg.RequestUnit.ReadCostPerByte = 0.0000152587890625 + oldCfg.RequestUnit.WriteBaseCost = 1.0 + oldCfg.RequestUnit.WriteCostPerByte = 0.0009765625 + oldCfg.RequestUnit.CPUMsCost = 0.3333333333333333 mockPrivider := &mockResourceGroupProvider{ - cfg: rmclient.Config{ - RequestUnit: rmclient.RequestUnitConfig{ - ReadBaseCost: 0.25, - ReadCostPerByte: 0.0000152587890625, - WriteBaseCost: 1.0, - WriteCostPerByte: 0.0009765625, - CPUMsCost: 0.3333333333333333, - }, - }, + cfg: *oldCfg, } resourceCtl, err := rmclient.NewResourceGroupController(context.Background(), 1, mockPrivider, nil) require.NoError(t, err) diff --git a/go.mod b/go.mod index eea654e06c1d5..74666ae96de23 100644 --- a/go.mod +++ b/go.mod @@ -95,7 +95,7 @@ require ( 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.20240510070118-c6d7a483b5e1 - github.com/tikv/pd/client v0.0.0-20231211083919-fe6fd1721aa6 + github.com/tikv/pd/client v0.0.0-20240708075102-05207d6819fb 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 diff --git a/go.sum b/go.sum index 9fbf641286c74..6e97e6d2bd72a 100644 --- a/go.sum +++ b/go.sum @@ -969,8 +969,8 @@ github.com/tiancaiamao/gp v0.0.0-20221230034425-4025bc8a4d4a h1:J/YdBZ46WKpXsxsW github.com/tiancaiamao/gp v0.0.0-20221230034425-4025bc8a4d4a/go.mod h1:h4xBhSNtOeEosLJ4P7JyKXX7Cabg7AVkWCK5gV2vOrM= github.com/tikv/client-go/v2 v2.0.8-0.20240510070118-c6d7a483b5e1 h1:NRAYutV0XCtLXVb414GXAShPmrfOQucbGgDHHuucTww= github.com/tikv/client-go/v2 v2.0.8-0.20240510070118-c6d7a483b5e1/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/tikv/pd/client v0.0.0-20240708075102-05207d6819fb h1:YAgGB92AiNCZdM5a65vdnJRX+gS+cc4OcUplWEU6O4w= +github.com/tikv/pd/client v0.0.0-20240708075102-05207d6819fb/go.mod h1:QCBn54O5lhfkYfxj8Tyiqaxue/mthHEMyi7AqJP/+n4= 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=