github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-04 01:40:07 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #17694 from hongchaodeng/ratelimit

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2015-11-26 13:12:26 -08:00
commit 4eb010b1f7
6 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/apiserver/handlers_test.go
View File

@ -35,7 +35,7 @@ import (
type fakeRL bool type fakeRL bool
func (fakeRL) Stop() {} func (fakeRL) Stop() {}
func (f fakeRL) CanAccept() bool { return bool(f) } func (f fakeRL) TryAccept() bool { return bool(f) }
func (f fakeRL) Accept() {} func (f fakeRL) Accept() {}
func expectHTTP(url string, code int, t *testing.T) { func expectHTTP(url string, code int, t *testing.T) {

2
pkg/controller/node/rate_limited_queue.go
View File

@ -163,7 +163,7 @@ func (q *RateLimitedTimedQueue) Try(fn ActionFunc) {
val, ok := q.queue.Head() val, ok := q.queue.Head()
for ok { for ok {
// rate limit the queue checking // rate limit the queue checking
if !q.limiter.CanAccept() { if !q.limiter.TryAccept() {
glog.V(10).Info("Try rate limitted...") glog.V(10).Info("Try rate limitted...")
// Try again later // Try again later
break break

2
pkg/kubelet/dockertools/docker.go
View File

@ -197,7 +197,7 @@ func (p dockerPuller) Pull(image string, secrets []api.Secret) error {
} }
func (p throttledDockerPuller) Pull(image string, secrets []api.Secret) error { func (p throttledDockerPuller) Pull(image string, secrets []api.Secret) error {
if p.limiter.CanAccept() { if p.limiter.TryAccept() {
return p.puller.Pull(image, secrets) return p.puller.Pull(image, secrets)
} }
return fmt.Errorf("pull QPS exceeded.") return fmt.Errorf("pull QPS exceeded.")

9
pkg/util/throttle.go
View File

@ -19,8 +19,9 @@ package util
import "github.com/juju/ratelimit" import "github.com/juju/ratelimit"
type RateLimiter interface { type RateLimiter interface {
// CanAccept returns true if the rate is below the limit, false otherwise // TryAccept returns true if a token is taken immediately. Otherwise,
CanAccept() bool // it returns false.
TryAccept() bool
// Accept returns once a token becomes available. // Accept returns once a token becomes available.
Accept() Accept()
// Stop stops the rate limiter, subsequent calls to CanAccept will return false // Stop stops the rate limiter, subsequent calls to CanAccept will return false
@ -47,7 +48,7 @@ func NewFakeRateLimiter() RateLimiter {
return &fakeRateLimiter{} return &fakeRateLimiter{}
} }
func (t *tickRateLimiter) CanAccept() bool { func (t *tickRateLimiter) TryAccept() bool {
return t.limiter.TakeAvailable(1) == 1 return t.limiter.TakeAvailable(1) == 1
} }
@ -59,7 +60,7 @@ func (t *tickRateLimiter) Accept() {
func (t *tickRateLimiter) Stop() { func (t *tickRateLimiter) Stop() {
} }
func (t *fakeRateLimiter) CanAccept() bool { func (t *fakeRateLimiter) TryAccept() bool {
return true return true
} }

10
pkg/util/throttle_test.go
View File

@ -24,28 +24,28 @@ import (
func TestBasicThrottle(t *testing.T) { func TestBasicThrottle(t *testing.T) {
r := NewTokenBucketRateLimiter(1, 3) r := NewTokenBucketRateLimiter(1, 3)
for i := 0; i < 3; i++ { for i := 0; i < 3; i++ {
if !r.CanAccept() { if !r.TryAccept() {
t.Error("unexpected false accept") t.Error("unexpected false accept")
} }
} }
if r.CanAccept() { if r.TryAccept() {
t.Error("unexpected true accept") t.Error("unexpected true accept")
} }
} }
func TestIncrementThrottle(t *testing.T) { func TestIncrementThrottle(t *testing.T) {
r := NewTokenBucketRateLimiter(1, 1) r := NewTokenBucketRateLimiter(1, 1)
if !r.CanAccept() { if !r.TryAccept() {
t.Error("unexpected false accept") t.Error("unexpected false accept")
} }
if r.CanAccept() { if r.TryAccept() {
t.Error("unexpected true accept") t.Error("unexpected true accept")
} }
// Allow to refill // Allow to refill
time.Sleep(2 * time.Second) time.Sleep(2 * time.Second)
if !r.CanAccept() { if !r.TryAccept() {
t.Error("unexpected false accept") t.Error("unexpected false accept")
} }
} }

4
plugin/pkg/scheduler/scheduler_test.go
View File

@ -303,14 +303,14 @@ type FakeRateLimiter struct {
acceptValues []bool acceptValues []bool
} }
func (fr *FakeRateLimiter) CanAccept() bool { func (fr *FakeRateLimiter) TryAccept() bool {
return true return true
} }
func (fr *FakeRateLimiter) Stop() {} func (fr *FakeRateLimiter) Stop() {}
func (fr *FakeRateLimiter) Accept() { func (fr *FakeRateLimiter) Accept() {
fr.acceptValues = append(fr.acceptValues, fr.r.CanAccept()) fr.acceptValues = append(fr.acceptValues, fr.r.TryAccept())
} }
func TestSchedulerRateLimitsBinding(t *testing.T) { func TestSchedulerRateLimitsBinding(t *testing.T) {