This is an automated cherry-pick of tikv#8028

ref tikv#7509

Signed-off-by: ti-chi-bot <[email protected]>

client/resource_group/controller/limiter.go

@@ -403,6 +403,7 @@ func (lim *Limiter) reserveN(now time.Time, n float64, maxFutureReserve time.Dur
 		lim.tokens = tokens
 		lim.maybeNotify()
 	} else {
+<<<<<<< HEAD
 		// print log if the limiter cannot reserve for a while.
 		if time.Since(lim.last) > reserveWarnLogInterval {
 			log.Warn("[resource group controller] cannot reserve enough tokens",
@@ -416,6 +417,18 @@ func (lim *Limiter) reserveN(now time.Time, n float64, maxFutureReserve time.Dur
 				zap.Int64("burst", lim.burst),
 				zap.Int("remaining-notify-times", lim.remainingNotifyTimes))
 		}
+=======
+		log.Warn("[resource group controller] cannot reserve enough tokens",
+			zap.Duration("need-wait-duration", waitDuration),
+			zap.Duration("max-wait-duration", maxFutureReserve),
+			zap.Float64("current-ltb-tokens", lim.tokens),
+			zap.Float64("current-ltb-rate", float64(lim.limit)),
+			zap.Float64("request-tokens", n),
+			zap.Float64("notify-threshold", lim.notifyThreshold),
+			zap.Bool("is-low-process", lim.isLowProcess),
+			zap.Int64("burst", lim.burst),
+			zap.Int("remaining-notify-times", lim.remainingNotifyTimes))
+>>>>>>> cbde63645 (client/controller: add logs and export more information in throttled error (#8028))
 		lim.last = last
 		if lim.limit == 0 {
 			lim.notify()