Skip to content

fix: Fix batch count exceeding threshold issue caused by first time access or expired lastPassTime in queuing strategy #594

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: Fix batch count exceeding threshold issue caused by first time access or expired lastPassTime in queuing strategy #594

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 22 additions & 7 deletions core/hotspot/traffic_shaping.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,16 +349,31 @@ func (c *throttlingTrafficShapingController) PerformChecking(arg interface{}, ba
}
intervalCostTime := int64(math.Round(float64(batchCount * c.durationInSec * 1000 / tokenCount)))
for {
currentTimeInMs := int64(util.CurrentTimeMillis())
lastPassTimePtr := timeCounter.AddIfAbsent(arg, &currentTimeInMs)
var (
expectedTime int64
currentTimeInMs int64
lastPassTime int64
lastPassTimePtr *int64
)

currentTimeInMs = int64(util.CurrentTimeMillis())
lastPassTimePtr = timeCounter.AddIfAbsent(arg, &currentTimeInMs)
if lastPassTimePtr == nil {
// first access arg
return nil
// initialize pointer for first access
lastPassTimePtr = &currentTimeInMs
}
// load the last pass time
lastPassTime := atomic.LoadInt64(lastPassTimePtr)
// calculate the expected pass time
expectedTime := lastPassTime + intervalCostTime
lastPassTime = atomic.LoadInt64(lastPassTimePtr)
// calculate expected pass time based on two scenarios:
// 1. first access or expired statistics window
// 2. normal within-window access
if lastPassTimePtr == &currentTimeInMs || lastPassTime < currentTimeInMs-(c.durationInSec*1000) {
// adjust the time of the previous window to one second ago, and at most TokenCount tokens can pass through
expectedTime = currentTimeInMs - (c.durationInSec * 1000) + intervalCostTime
} else {
// normal cumulative calculation
expectedTime = lastPassTime + intervalCostTime
}

if expectedTime <= currentTimeInMs || expectedTime-currentTimeInMs < c.maxQueueingTimeMs {
if atomic.CompareAndSwapInt64(lastPassTimePtr, lastPassTime, currentTimeInMs) {
Expand Down
Loading