go/kratos
1
0
Fork 0
mirror of https://github.com/go-kratos/kratos.git synced 2025-01-10 00:29:01 +02:00
Code Issues Releases Activity

Merge pull request #167 from bilibili/library/bbr-prev-drop

Browse Source 
make pre-drop thread-safe in bbr
This commit is contained in:
Terry.Mao 2019-06-22 08:50:13 +08:00 committed by GitHub
commit 6e4754cfb3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/ratelimit/bbr/bbr.go
View File

@ -70,7 +70,7 @@ type BBR struct {
inFlight int64
winBucketPerSec int64
conf *Config
prevDrop time.Time
prevDrop int64
}
// Config contains configs of bbr limiter.
@ -130,7 +130,8 @@ func (l *BBR) shouldDrop() bool {
inFlight := atomic.LoadInt64(&l.inFlight)
maxInflight := l.maxFlight()
if l.cpu() < l.conf.CPUThreshold {
if time.Now().Sub(l.prevDrop) <= 1000*time.Millisecond {
prevDrop := atomic.LoadInt64(&l.prevDrop)
if time.Now().Unix()-prevDrop <= 1 {
return inFlight > 1 && inFlight > maxInflight
}
return false
@ -157,7 +158,7 @@ func (l *BBR) Allow(ctx context.Context, opts ...limit.AllowOption) (func(info l
opt.Apply(&allowOpts)
}
if l.shouldDrop() {
l.prevDrop = time.Now()
atomic.StoreInt64(&l.prevDrop, time.Now().Unix())
return nil, ecode.LimitExceed
}
atomic.AddInt64(&l.inFlight, 1)
@ -193,7 +194,6 @@ func newLimiter(conf *Config) limit.Limiter {
passStat: passStat,
rtStat: rtStat,
winBucketPerSec: int64(time.Second) / (int64(conf.Window) / int64(conf.WinBucket)),
prevDrop: time.Unix(0, 0),
}
return limiter
}

1
pkg/ratelimit/bbr/bbr_test.go
View File

@ -133,7 +133,6 @@ func TestBBRShouldDrop(t *testing.T) {
passStat: passStat,
rtStat: rtStat,
winBucketPerSec: 10,
prevDrop: time.Unix(0, 0),
conf: defaultConf,
}
// cpu >= 800, inflight < maxQps