Merge branch 'master' into fix-unhealthy-repair

client/go.mod

@@ -8,12 +8,13 @@ require (
  github.com/opentracing/opentracing-go v1.2.0
  github.com/pingcap/errors v0.11.5-0.20211224045212-9687c2b0f87c
  github.com/pingcap/failpoint v0.0.0-20210918120811-547c13e3eb00
- github.com/pingcap/kvproto v0.0.0-20230713060620-89756bd21be1
+ github.com/pingcap/kvproto v0.0.0-20230720094213-a3b4a77b4333
  github.com/pingcap/log v1.1.1-0.20221110025148-ca232912c9f3
  github.com/prometheus/client_golang v1.11.1
  github.com/stretchr/testify v1.8.2
  go.uber.org/goleak v1.1.11
  go.uber.org/zap v1.24.0
+ golang.org/x/exp v0.0.0-20230711005742-c3f37128e5a4
  google.golang.org/grpc v1.54.0
 )
 

client/go.sum

@@ -86,8 +86,8 @@ github.com/pingcap/errors v0.11.5-0.20211224045212-9687c2b0f87c h1:xpW9bvK+HuuTm
 github.com/pingcap/errors v0.11.5-0.20211224045212-9687c2b0f87c/go.mod h1:X2r9ueLEUZgtx2cIogM0v4Zj5uvvzhuuiu7Pn8HzMPg=
 github.com/pingcap/failpoint v0.0.0-20210918120811-547c13e3eb00 h1:C3N3itkduZXDZFh4N3vQ5HEtld3S+Y+StULhWVvumU0=
 github.com/pingcap/failpoint v0.0.0-20210918120811-547c13e3eb00/go.mod h1:4qGtCB0QK0wBzKtFEGDhxXnSnbQApw1gc9siScUl8ew=
-github.com/pingcap/kvproto v0.0.0-20230713060620-89756bd21be1 h1:sC3XRNNBQNjFJGRtSzJRvqi2aDLFOsQoCHItr9rbbY8=
-github.com/pingcap/kvproto v0.0.0-20230713060620-89756bd21be1/go.mod h1:r0q/CFcwvyeRhKtoqzmWMBebrtpIziQQ9vR+JKh1knc=
+github.com/pingcap/kvproto v0.0.0-20230720094213-a3b4a77b4333 h1:A6Wqgq0uMw51UiRAH27TVN0QlzVR5CVtV6fTQSAmvKM=
+github.com/pingcap/kvproto v0.0.0-20230720094213-a3b4a77b4333/go.mod h1:r0q/CFcwvyeRhKtoqzmWMBebrtpIziQQ9vR+JKh1knc=
 github.com/pingcap/log v1.1.1-0.20221110025148-ca232912c9f3 h1:HR/ylkkLmGdSSDaD8IDP+SZrdhV1Kibl9KrHxJ9eciw=
 github.com/pingcap/log v1.1.1-0.20221110025148-ca232912c9f3/go.mod h1:DWQW5jICDR7UJh4HtxXSM20Churx4CQL0fwL/SoOSA4=
 github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
@@ -152,6 +152,8 @@ golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnf
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/exp v0.0.0-20230711005742-c3f37128e5a4 h1:QLureRX3moex6NVu/Lr4MGakp9FdA7sBHGBmvRW7NaM=
+golang.org/x/exp v0.0.0-20230711005742-c3f37128e5a4/go.mod h1:FXUEEKJgO7OQYeo8N01OfiKP8RXMtf6e8aTskBGqWdc=
 golang.org/x/lint v0.0.0-20190930215403-16217165b5de h1:5hukYrvBGR8/eNkX5mdUezrA6JiaEZDtJb9Ei+1LlBs=
 golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
 golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=

client/resource_group/controller/controller.go

@@ -18,6 +18,7 @@ import (
  "context"
  "encoding/json"
  "math"
+ "strings"
  "sync"
  "sync/atomic"
  "time"
@@ -32,6 +33,7 @@ import (
  pd "github.com/tikv/pd/client"
  "github.com/tikv/pd/client/errs"
  "go.uber.org/zap"
+ "golang.org/x/exp/slices"
 )
 
 const (
@@ -56,8 +58,10 @@ const (
 type ResourceGroupKVInterceptor interface {
  // OnRequestWait is used to check whether resource group has enough tokens. It maybe needs to wait some time.
  OnRequestWait(ctx context.Context, resourceGroupName string, info RequestInfo) (*rmpb.Consumption, *rmpb.Consumption, error)
- // OnResponse is used to consume tokens after receiving response
+ // OnResponse is used to consume tokens after receiving response.
  OnResponse(resourceGroupName string, req RequestInfo, resp ResponseInfo) (*rmpb.Consumption, error)
+ // IsBackgroundRequest If the resource group has background jobs, we should not record consumption and wait for it.
+ IsBackgroundRequest(ctx context.Context, resourceGroupName, requestResource string) bool
 }
 
 // ResourceGroupProvider provides some api to interact with resource manager server.
@@ -454,7 +458,6 @@ func (c *ResourceGroupsController) OnRequestWait(
 ) (*rmpb.Consumption, *rmpb.Consumption, error) {
  gc, err := c.tryGetResourceGroup(ctx, resourceGroupName)
  if err != nil {
- failedRequestCounter.WithLabelValues(resourceGroupName).Inc()
  return nil, nil, err
  }
  return gc.onRequestWait(ctx, info)
@@ -472,6 +475,41 @@ func (c *ResourceGroupsController) OnResponse(
  return tmp.(*groupCostController).onResponse(req, resp)
 }
 
+// IsBackgroundRequest If the resource group has background jobs, we should not record consumption and wait for it.
+func (c *ResourceGroupsController) IsBackgroundRequest(ctx context.Context,
+ resourceGroupName, requestResource string) bool {
+ gc, err := c.tryGetResourceGroup(ctx, resourceGroupName)
+ if err != nil {
+ failedRequestCounter.WithLabelValues(resourceGroupName).Inc()
+ return false
+ }
+
+ return c.checkBackgroundSettings(ctx, gc.getMeta().BackgroundSettings, requestResource)
+}
+
+func (c *ResourceGroupsController) checkBackgroundSettings(ctx context.Context, bg *rmpb.BackgroundSettings, requestResource string) bool {
+ // fallback to default resource group.
+ if bg == nil {
+ resourceGroupName := "default"
+ gc, err := c.tryGetResourceGroup(ctx, resourceGroupName)
+ if err != nil {
+ failedRequestCounter.WithLabelValues(resourceGroupName).Inc()
+ return false
+ }
+ bg = gc.getMeta().BackgroundSettings
+ }
+
+ if bg == nil || len(requestResource) == 0 || len(bg.JobTypes) == 0 {
+ return false
+ }
+
+ if idx := strings.LastIndex(requestResource, "_"); idx != -1 {
+ return slices.Contains(bg.JobTypes, requestResource[idx+1:])
+ }
+
+ return false
+}
+
 // GetResourceGroup returns the meta setting of the given resource group name.
 func (c *ResourceGroupsController) GetResourceGroup(resourceGroupName string) (*rmpb.ResourceGroup, error) {
  gc, err := c.tryGetResourceGroup(c.loopCtx, resourceGroupName)
@@ -518,7 +556,7 @@ type groupCostController struct {
  lastRequestTime time.Time
 
  // requestInProgress is set true when sending token bucket request.
- // And it is set false when reciving token bucket response.
+ // And it is set false when receiving token bucket response.
  // This triggers a retry attempt on the next tick.
  requestInProgress bool
 
@@ -1045,8 +1083,8 @@ func (gc *groupCostController) collectRequestAndConsumption(selectTyp selectType
 }
 
 func (gc *groupCostController) getMeta() *rmpb.ResourceGroup {
- gc.metaLock.Lock()
- defer gc.metaLock.Unlock()
+ gc.metaLock.RLock()
+ defer gc.metaLock.RUnlock()
  return gc.meta
 }
 

client/resource_group/controller/controller_test.go

@@ -39,6 +39,9 @@ func createTestGroupCostController(re *require.Assertions) *groupCostController
  },
  },
  },
+ BackgroundSettings: &rmpb.BackgroundSettings{
+ JobTypes: []string{"lightning", "br"},
+ },
  }
  ch1 := make(chan struct{})
  ch2 := make(chan *groupCostController)

client/resource_group/controller/model.go

@@ -18,7 +18,7 @@ import (
  "os"
  "time"
 
- "github.com/cloudfoundry/gosigar"
+ sigar "github.com/cloudfoundry/gosigar"
  "go.uber.org/zap"
 
  rmpb "github.com/pingcap/kvproto/pkg/resource_manager"

go.mod

@@ -30,7 +30,7 @@ require (
  github.com/pingcap/errcode v0.3.0
  github.com/pingcap/errors v0.11.5-0.20211224045212-9687c2b0f87c
  github.com/pingcap/failpoint v0.0.0-20210918120811-547c13e3eb00
- github.com/pingcap/kvproto v0.0.0-20230713060620-89756bd21be1
+ github.com/pingcap/kvproto v0.0.0-20230720094213-a3b4a77b4333
  github.com/pingcap/log v1.1.1-0.20221110025148-ca232912c9f3
  github.com/pingcap/sysutil v1.0.1-0.20230407040306-fb007c5aff21
  github.com/pingcap/tidb-dashboard v0.0.0-20230705095454-5e220f970f27

go.sum

@@ -424,8 +424,8 @@ github.com/pingcap/errors v0.11.5-0.20211224045212-9687c2b0f87c/go.mod h1:X2r9ue
 github.com/pingcap/failpoint v0.0.0-20210918120811-547c13e3eb00 h1:C3N3itkduZXDZFh4N3vQ5HEtld3S+Y+StULhWVvumU0=
 github.com/pingcap/failpoint v0.0.0-20210918120811-547c13e3eb00/go.mod h1:4qGtCB0QK0wBzKtFEGDhxXnSnbQApw1gc9siScUl8ew=
 github.com/pingcap/kvproto v0.0.0-20191211054548-3c6b38ea5107/go.mod h1:WWLmULLO7l8IOcQG+t+ItJ3fEcrL5FxF0Wu+HrMy26w=
-github.com/pingcap/kvproto v0.0.0-20230713060620-89756bd21be1 h1:sC3XRNNBQNjFJGRtSzJRvqi2aDLFOsQoCHItr9rbbY8=
-github.com/pingcap/kvproto v0.0.0-20230713060620-89756bd21be1/go.mod h1:r0q/CFcwvyeRhKtoqzmWMBebrtpIziQQ9vR+JKh1knc=
+github.com/pingcap/kvproto v0.0.0-20230720094213-a3b4a77b4333 h1:A6Wqgq0uMw51UiRAH27TVN0QlzVR5CVtV6fTQSAmvKM=
+github.com/pingcap/kvproto v0.0.0-20230720094213-a3b4a77b4333/go.mod h1:r0q/CFcwvyeRhKtoqzmWMBebrtpIziQQ9vR+JKh1knc=
 github.com/pingcap/log v0.0.0-20210625125904-98ed8e2eb1c7/go.mod h1:8AanEdAHATuRurdGxZXBz0At+9avep+ub7U1AGYLIMM=
 github.com/pingcap/log v1.1.1-0.20221110025148-ca232912c9f3 h1:HR/ylkkLmGdSSDaD8IDP+SZrdhV1Kibl9KrHxJ9eciw=
 github.com/pingcap/log v1.1.1-0.20221110025148-ca232912c9f3/go.mod h1:DWQW5jICDR7UJh4HtxXSM20Churx4CQL0fwL/SoOSA4=

pkg/mcs/resourcemanager/server/grpc_service.go

@@ -190,10 +190,15 @@ func (s *Service) AcquireTokenBuckets(stream rmpb.ResourceManager_AcquireTokenBu
  continue
  }
  // Send the consumption to update the metrics.
+ isBackground := req.GetIsBackground()
  s.manager.consumptionDispatcher <- struct {
  resourceGroupName string
  *rmpb.Consumption
- }{resourceGroupName, req.GetConsumptionSinceLastRequest()}
+ isBackground bool
+ }{resourceGroupName, req.GetConsumptionSinceLastRequest(), isBackground}
+ if isBackground {
+ continue
+ }
  now := time.Now()
  resp := &rmpb.TokenBucketResponse{
  ResourceGroupName: rg.Name,

pkg/mcs/resourcemanager/server/manager.go

@@ -56,6 +56,7 @@ type Manager struct {
  consumptionDispatcher chan struct {
  resourceGroupName string
  *rmpb.Consumption
+ isBackground bool
  }
  // record update time of each resource group
  consumptionRecord map[string]time.Time
@@ -76,6 +77,7 @@ func NewManager[T ResourceManagerConfigProvider](srv bs.Server) *Manager {
  consumptionDispatcher: make(chan struct {
  resourceGroupName string
  *rmpb.Consumption
+ isBackground bool
  }, defaultConsumptionChanSize),
  consumptionRecord: make(map[string]time.Time),
  }
@@ -300,15 +302,20 @@ func (m *Manager) backgroundMetricsFlush(ctx context.Context) {
  if consumption == nil {
  continue
  }
+ backgroundType := ""
+ if consumptionInfo.isBackground {
+ backgroundType = backgroundTypeLabel
+ }
+
  var (
  name = consumptionInfo.resourceGroupName
- rruMetrics = readRequestUnitCost.WithLabelValues(name)
- wruMetrics = writeRequestUnitCost.WithLabelValues(name)
+ rruMetrics = readRequestUnitCost.WithLabelValues(name, backgroundType)
+ wruMetrics = writeRequestUnitCost.WithLabelValues(name, backgroundType)
  sqlLayerRuMetrics = sqlLayerRequestUnitCost.WithLabelValues(name)
- readByteMetrics = readByteCost.WithLabelValues(name)
- writeByteMetrics = writeByteCost.WithLabelValues(name)
- kvCPUMetrics = kvCPUCost.WithLabelValues(name)
- sqlCPUMetrics = sqlCPUCost.WithLabelValues(name)
+ readByteMetrics = readByteCost.WithLabelValues(name, backgroundType)
+ writeByteMetrics = writeByteCost.WithLabelValues(name, backgroundType)
+ kvCPUMetrics = kvCPUCost.WithLabelValues(name, backgroundType)
+ sqlCPUMetrics = sqlCPUCost.WithLabelValues(name, backgroundType)
  readRequestCountMetrics = requestCount.WithLabelValues(name, readTypeLabel)
  writeRequestCountMetrics = requestCount.WithLabelValues(name, writeTypeLabel)
  )

pkg/mcs/resourcemanager/server/metrics.go

@@ -25,6 +25,7 @@ const (
  typeLabel = "type"
  readTypeLabel = "read"
  writeTypeLabel = "write"
+ backgroundTypeLabel = "background"
 )
 
 var (
@@ -44,14 +45,14 @@ var (
  Subsystem: ruSubsystem,
  Name: "read_request_unit_sum",
  Help: "Counter of the read request unit cost for all resource groups.",
- }, []string{resourceGroupNameLabel})
+ }, []string{resourceGroupNameLabel, typeLabel})
  writeRequestUnitCost = prometheus.NewCounterVec(
  prometheus.CounterOpts{
  Namespace: namespace,
  Subsystem: ruSubsystem,
  Name: "write_request_unit_sum",
  Help: "Counter of the write request unit cost for all resource groups.",
- }, []string{resourceGroupNameLabel})
+ }, []string{resourceGroupNameLabel, typeLabel})
  sqlLayerRequestUnitCost = prometheus.NewCounterVec(
  prometheus.CounterOpts{
  Namespace: namespace,
@@ -67,28 +68,28 @@ var (
  Subsystem: resourceSubsystem,
  Name: "read_byte_sum",
  Help: "Counter of the read byte cost for all resource groups.",
- }, []string{resourceGroupNameLabel})
+ }, []string{resourceGroupNameLabel, typeLabel})
  writeByteCost = prometheus.NewCounterVec(
  prometheus.CounterOpts{
  Namespace: namespace,
  Subsystem: resourceSubsystem,
  Name: "write_byte_sum",
  Help: "Counter of the write byte cost for all resource groups.",
- }, []string{resourceGroupNameLabel})
+ }, []string{resourceGroupNameLabel, typeLabel})
  kvCPUCost = prometheus.NewCounterVec(
  prometheus.CounterOpts{
  Namespace: namespace,
  Subsystem: resourceSubsystem,
  Name: "kv_cpu_time_ms_sum",
  Help: "Counter of the KV CPU time cost in milliseconds for all resource groups.",
- }, []string{resourceGroupNameLabel})
+ }, []string{resourceGroupNameLabel, typeLabel})
  sqlCPUCost = prometheus.NewCounterVec(
  prometheus.CounterOpts{
  Namespace: namespace,
  Subsystem: resourceSubsystem,
  Name: "sql_cpu_time_ms_sum",
  Help: "Counter of the SQL CPU time cost in milliseconds for all resource groups.",
- }, []string{resourceGroupNameLabel})
+ }, []string{resourceGroupNameLabel, typeLabel})
  requestCount = prometheus.NewCounterVec(
  prometheus.CounterOpts{
  Namespace: namespace,

pkg/mcs/resourcemanager/server/resource_group.go

@@ -106,7 +106,6 @@ func (rg *ResourceGroup) PatchSettings(metaGroup *rmpb.ResourceGroup) error {
  return errors.New("invalid resource group settings, RU mode should set RU settings")
  }
  rg.RUSettings.RU.patch(settings.GetRU())
- log.Info("patch resource group ru settings", zap.String("name", rg.Name), zap.Any("settings", settings))
  case rmpb.GroupMode_RawMode:
  panic("no implementation")
  }

tests/integrations/client/go.mod

@@ -13,7 +13,7 @@ replace google.golang.org/grpc v1.54.0 => google.golang.org/grpc v1.26.0
 require (
  github.com/docker/go-units v0.4.0
  github.com/pingcap/failpoint v0.0.0-20210918120811-547c13e3eb00
- github.com/pingcap/kvproto v0.0.0-20230713060620-89756bd21be1
+ github.com/pingcap/kvproto v0.0.0-20230720094213-a3b4a77b4333
  github.com/pingcap/log v1.1.1-0.20221110025148-ca232912c9f3
  github.com/stretchr/testify v1.8.2
  github.com/tikv/pd v0.0.0-00010101000000-000000000000
@@ -160,7 +160,7 @@ require (
  go.uber.org/fx v1.12.0 // indirect
  go.uber.org/multierr v1.11.0 // indirect
  golang.org/x/crypto v0.1.0 // indirect
- golang.org/x/exp v0.0.0-20230108222341-4b8118a2686a // indirect
+ golang.org/x/exp v0.0.0-20230711005742-c3f37128e5a4 // indirect
  golang.org/x/image v0.5.0 // indirect
  golang.org/x/net v0.10.0 // indirect
  golang.org/x/oauth2 v0.4.0 // indirect

tests/integrations/client/go.sum

@@ -387,8 +387,8 @@ github.com/pingcap/errors v0.11.5-0.20211224045212-9687c2b0f87c/go.mod h1:X2r9ue
 github.com/pingcap/failpoint v0.0.0-20210918120811-547c13e3eb00 h1:C3N3itkduZXDZFh4N3vQ5HEtld3S+Y+StULhWVvumU0=
 github.com/pingcap/failpoint v0.0.0-20210918120811-547c13e3eb00/go.mod h1:4qGtCB0QK0wBzKtFEGDhxXnSnbQApw1gc9siScUl8ew=
 github.com/pingcap/kvproto v0.0.0-20191211054548-3c6b38ea5107/go.mod h1:WWLmULLO7l8IOcQG+t+ItJ3fEcrL5FxF0Wu+HrMy26w=
-github.com/pingcap/kvproto v0.0.0-20230713060620-89756bd21be1 h1:sC3XRNNBQNjFJGRtSzJRvqi2aDLFOsQoCHItr9rbbY8=
-github.com/pingcap/kvproto v0.0.0-20230713060620-89756bd21be1/go.mod h1:r0q/CFcwvyeRhKtoqzmWMBebrtpIziQQ9vR+JKh1knc=
+github.com/pingcap/kvproto v0.0.0-20230720094213-a3b4a77b4333 h1:A6Wqgq0uMw51UiRAH27TVN0QlzVR5CVtV6fTQSAmvKM=
+github.com/pingcap/kvproto v0.0.0-20230720094213-a3b4a77b4333/go.mod h1:r0q/CFcwvyeRhKtoqzmWMBebrtpIziQQ9vR+JKh1knc=
 github.com/pingcap/log v0.0.0-20191012051959-b742a5d432e9/go.mod h1:4rbK1p9ILyIfb6hU7OG2CiWSqMXnp3JMbiaVJ6mvoY8=
 github.com/pingcap/log v0.0.0-20210625125904-98ed8e2eb1c7/go.mod h1:8AanEdAHATuRurdGxZXBz0At+9avep+ub7U1AGYLIMM=
 github.com/pingcap/log v1.1.1-0.20221110025148-ca232912c9f3 h1:HR/ylkkLmGdSSDaD8IDP+SZrdhV1Kibl9KrHxJ9eciw=
@@ -596,8 +596,8 @@ golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4/go.mod h1:IxCIyHEi3zRg3s0
 golang.org/x/crypto v0.1.0 h1:MDRAIl0xIo9Io2xV565hzXHw3zVseKrJKodhohM5CjU=
 golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
-golang.org/x/exp v0.0.0-20230108222341-4b8118a2686a h1:tlXy25amD5A7gOfbXdqCGN5k8ESEed/Ee1E5RcrYnqU=
-golang.org/x/exp v0.0.0-20230108222341-4b8118a2686a/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
+golang.org/x/exp v0.0.0-20230711005742-c3f37128e5a4 h1:QLureRX3moex6NVu/Lr4MGakp9FdA7sBHGBmvRW7NaM=
+golang.org/x/exp v0.0.0-20230711005742-c3f37128e5a4/go.mod h1:FXUEEKJgO7OQYeo8N01OfiKP8RXMtf6e8aTskBGqWdc=
 golang.org/x/image v0.0.0-20200119044424-58c23975cae1/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
 golang.org/x/image v0.5.0 h1:5JMiNunQeQw++mMOz48/ISeNu3Iweh/JaZU8ZLqHRrI=
 golang.org/x/image v0.5.0/go.mod h1:FVC7BI/5Ym8R25iw5OLsgshdUBbT1h5jZTpA+mvAdZ4=
@@ -613,7 +613,7 @@ golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
-golang.org/x/mod v0.8.0 h1:LUYupSeNrTNCGzR/hVBk2NHZO4hXcVaW1k4Qx7rjPx8=
+golang.org/x/mod v0.11.0 h1:bUO06HqtnRcc/7l71XBe4WcqTZ+3AH1J59zWDDwLKgU=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=

tests/integrations/mcs/go.mod

@@ -12,7 +12,7 @@ replace google.golang.org/grpc v1.54.0 => google.golang.org/grpc v1.26.0
 
 require (
  github.com/pingcap/failpoint v0.0.0-20210918120811-547c13e3eb00
- github.com/pingcap/kvproto v0.0.0-20230713060620-89756bd21be1
+ github.com/pingcap/kvproto v0.0.0-20230720094213-a3b4a77b4333
  github.com/pingcap/log v1.1.1-0.20221110025148-ca232912c9f3
  github.com/stretchr/testify v1.8.2
  github.com/tikv/pd v0.0.0-00010101000000-000000000000
@@ -160,7 +160,7 @@ require (
  go.uber.org/fx v1.12.0 // indirect
  go.uber.org/multierr v1.11.0 // indirect
  golang.org/x/crypto v0.1.0 // indirect
- golang.org/x/exp v0.0.0-20230108222341-4b8118a2686a // indirect
+ golang.org/x/exp v0.0.0-20230711005742-c3f37128e5a4 // indirect
  golang.org/x/image v0.5.0 // indirect
  golang.org/x/net v0.10.0 // indirect
  golang.org/x/oauth2 v0.4.0 // indirect