Skip to content

Commit

Permalink
fix
Browse files Browse the repository at this point in the history
Signed-off-by: Shuning Chen <nolouch@ShuningdeMacBook-Pro.local>
  • Loading branch information
Shuning Chen authored and Shuning Chen committed Jul 3, 2024
1 parent e07be6a commit dcebb36
Showing 1 changed file with 2 additions and 9 deletions.
11 changes: 2 additions & 9 deletions client/resource_group/controller/controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,20 +36,13 @@ import (
)

const (
<<<<<<< HEAD
controllerConfigPath = "resource_group/controller"
maxRetry = 10
retryInterval = 50 * time.Millisecond
maxNotificationChanLen = 200
needTokensAmplification = 1.1
trickleReserveDuration = 1250 * time.Millisecond
=======
controllerConfigPath = "resource_group/controller"
maxRetry = 10
retryInterval = 50 * time.Millisecond
maxNotificationChanLen = 200
needTokensAmplification = 1.1
trickleReserveDuration = 1250 * time.Millisecond
slowNotifyFilterDuration = 10 * time.Millisecond
>>>>>>> 49f9b115c (client/controller: record context error and add slowlog about token bucket (#8344))

watchRetryInterval = 30 * time.Second
)
Expand Down

0 comments on commit dcebb36

Please sign in to comment.