This is an automated cherry-pick of tikv#7042

close tikv#7043

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>

client/go.mod

@@ -3,7 +3,12 @@ module github.com/tikv/pd/client
 go 1.20
 
 require (
+<<<<<<< HEAD
  github.com/elastic/gosigar v0.14.2
+=======
+ github.com/BurntSushi/toml v0.3.1
+ github.com/cloudfoundry/gosigar v1.3.6
+>>>>>>> 54eb4e495 (resource_control: supports dynamically change the controller config (#7042))
  github.com/gogo/protobuf v1.3.2
  github.com/opentracing/opentracing-go v1.2.0
  github.com/pingcap/errors v0.11.5-0.20211224045212-9687c2b0f87c

client/go.sum

@@ -1,4 +1,5 @@
 cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
+github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
 github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=

client/resource_group/controller/config.go

@@ -52,7 +52,7 @@ const (
  // According to the resource control Grafana panel and Prometheus sampling period, the period should be the factor of 15.
  defaultTargetPeriod = 5 * time.Second
  // defaultMaxWaitDuration is the max duration to wait for the token before throwing error.
- defaultMaxWaitDuration = time.Second
+ defaultMaxWaitDuration = 30 * time.Second
 )
 
 const (
@@ -67,23 +67,39 @@ const (
 
  // Because the resource manager has not been deployed in microservice mode,
  // do not enable this function.
+<<<<<<< HEAD
  defaultDegradedModeWaitDuration = "0s"
+=======
+ defaultDegradedModeWaitDuration = 0
+ defaultAvgBatchProportion = 0.7
+>>>>>>> 54eb4e495 (resource_control: supports dynamically change the controller config (#7042))
 )
 
 // ControllerConfig is the configuration of the resource manager controller which includes some option for client needed.
 type ControllerConfig struct {
  // EnableDegradedMode is to control whether resource control client enable degraded mode when server is disconnect.
- DegradedModeWaitDuration string `toml:"degraded-mode-wait-duration" json:"degraded-mode-wait-duration"`
+ DegradedModeWaitDuration Duration `toml:"degraded-mode-wait-duration" json:"degraded-mode-wait-duration"`
+
+ // LTBMaxWaitDuration is the max wait time duration for local token bucket.
+ LTBMaxWaitDuration Duration `toml:"ltb-max-wait-duration" json:"ltb-max-wait-duration"`
 
  // RequestUnit is the configuration determines the coefficients of the RRU and WRU cost.
  // This configuration should be modified carefully.
  RequestUnit RequestUnitConfig `toml:"request-unit" json:"request-unit"`
 }
 
+<<<<<<< HEAD
 // DefaultControllerConfig returns the default resource manager controller configuration.
 func DefaultControllerConfig() *ControllerConfig {
  return &ControllerConfig{
  DegradedModeWaitDuration: defaultDegradedModeWaitDuration,
+=======
+// DefaultConfig returns the default resource manager controller configuration.
+func DefaultConfig() *Config {
+ return &Config{
+ DegradedModeWaitDuration: NewDuration(defaultDegradedModeWaitDuration),
+ LTBMaxWaitDuration: NewDuration(defaultMaxWaitDuration),
+>>>>>>> 54eb4e495 (resource_control: supports dynamically change the controller config (#7042))
  RequestUnit: DefaultRequestUnitConfig(),
  }
 }
@@ -128,8 +144,10 @@ type Config struct {
  WriteBytesCost RequestUnit
  CPUMsCost RequestUnit
  // The CPU statistics need to distinguish between different environments.
- isSingleGroupByKeyspace bool
- maxWaitDuration time.Duration
+ isSingleGroupByKeyspace bool
+
+ // some config for client
+ LTBMaxWaitDuration time.Duration
  DegradedModeWaitDuration time.Duration
 }
 
@@ -140,6 +158,7 @@ func DefaultConfig() *Config {
  )
 }
 
+<<<<<<< HEAD
 // GenerateConfig generates the configuration by the given request unit configuration.
 func GenerateConfig(config *ControllerConfig) *Config {
  cfg := &Config{
@@ -149,12 +168,19 @@ func GenerateConfig(config *ControllerConfig) *Config {
  WriteBytesCost: RequestUnit(config.RequestUnit.WriteCostPerByte),
  CPUMsCost: RequestUnit(config.RequestUnit.CPUMsCost),
  maxWaitDuration: defaultMaxWaitDuration,
+=======
+// GenerateRUConfig generates the configuration by the given request unit configuration.
+func GenerateRUConfig(config *Config) *RUConfig {
+ return &RUConfig{
+ ReadBaseCost: RequestUnit(config.RequestUnit.ReadBaseCost),
+ ReadPerBatchBaseCost: RequestUnit(config.RequestUnit.ReadPerBatchBaseCost),
+ ReadBytesCost: RequestUnit(config.RequestUnit.ReadCostPerByte),
+ WriteBaseCost: RequestUnit(config.RequestUnit.WriteBaseCost),
+ WritePerBatchBaseCost: RequestUnit(config.RequestUnit.WritePerBatchBaseCost),
+ WriteBytesCost: RequestUnit(config.RequestUnit.WriteCostPerByte),
+ CPUMsCost: RequestUnit(config.RequestUnit.CPUMsCost),
+ LTBMaxWaitDuration: config.LTBMaxWaitDuration.Duration,
+ DegradedModeWaitDuration: config.DegradedModeWaitDuration.Duration,
+>>>>>>> 54eb4e495 (resource_control: supports dynamically change the controller config (#7042))
  }
- duration, err := time.ParseDuration(config.DegradedModeWaitDuration)
- if err != nil {
- cfg.DegradedModeWaitDuration, _ = time.ParseDuration(defaultDegradedModeWaitDuration)
- } else {
- cfg.DegradedModeWaitDuration = duration
- }
- return cfg
 }