fix

Signed-off-by: nolouch <nolouch@gmail.com>
tikv · May 28, 2024 · 30a318f · 30a318f
1 parent bf2ceb2
commit 30a318f
Showing 1 changed file with 1 addition and 7 deletions.
diff --git a/client/resource_group/controller/controller.go b/client/resource_group/controller/controller.go
@@ -1245,15 +1245,9 @@ func (gc *groupCostController) onRequestWait(
 					break retryLoop
 				}
 			}
-<<<<<<< HEAD
-			gc.requestRetryCounter.Inc()
+			gc.metrics.requestRetryCounter.Inc()
 			time.Sleep(retryInterval)
 			waitDuration += retryInterval
-=======
-			gc.metrics.requestRetryCounter.Inc()
-			time.Sleep(gc.mainCfg.WaitRetryInterval)
-			waitDuration += gc.mainCfg.WaitRetryInterval
->>>>>>> b7d8b9406 (controller: fix error retry and add more metrics (#8219))
 		}
 		if err != nil {
 			if errs.ErrClientResourceGroupThrottled.Equal(err) {