Merge pull request #211 from kevwan/master

avoid data race while using Rand in sre_breaker.go
pull/229/head
Terry.Mao 6 years ago committed by GitHub
commit a65edf16ac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 22
      pkg/net/netutil/breaker/sre_breaker.go
  2. 16
      pkg/net/netutil/breaker/sre_breaker_test.go

@ -3,6 +3,7 @@ package breaker
import (
"math"
"math/rand"
"sync"
"sync/atomic"
"time"
@ -14,12 +15,14 @@ import (
// sreBreaker is a sre CircuitBreaker pattern.
type sreBreaker struct {
stat metric.RollingCounter
r *rand.Rand
// rand.New(...) returns a non thread safe object
randLock sync.Mutex
k float64
request int64
state int32
r *rand.Rand
}
func newSRE(c *Config) Breaker {
@ -69,14 +72,14 @@ func (b *sreBreaker) Allow() error {
atomic.CompareAndSwapInt32(&b.state, StateClosed, StateOpen)
}
dr := math.Max(0, (float64(total)-k)/float64(total+1))
rr := b.r.Float64()
drop := b.trueOnProba(dr)
if log.V(5) {
log.Info("breaker: drop ratio: %f, real rand: %f, drop: %v", dr, rr, dr > rr)
}
if dr <= rr {
return nil
log.Info("breaker: drop ratio: %f, drop: %t", dr, drop)
}
if drop {
return ecode.ServiceUnavailable
}
return nil
}
func (b *sreBreaker) MarkSuccess() {
@ -88,3 +91,10 @@ func (b *sreBreaker) MarkFailed() {
// drop ratio higher.
b.stat.Add(0)
}
func (b *sreBreaker) trueOnProba(proba float64) (truth bool) {
b.randLock.Lock()
truth = b.r.Float64() < proba
b.randLock.Unlock()
return
}

@ -147,6 +147,22 @@ func TestSRESummary(t *testing.T) {
})
}
func TestTrueOnProba(t *testing.T) {
const proba = math.Pi / 10
const total = 100000
const epsilon = 0.05
var count int
b := getSREBreaker()
for i := 0; i < total; i++ {
if b.trueOnProba(proba) {
count++
}
}
ratio := float64(count) / float64(total)
assert.InEpsilon(t, proba, ratio, epsilon)
}
func BenchmarkSreBreakerAllow(b *testing.B) {
breaker := getSRE()
b.ResetTimer()

Loading…
Cancel
Save