Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6692 from fanminshi/lease_expire_compact_fix

Browse Source 
functional-tester: add rate limiter to lease stresser
This commit is contained in:
fanmin shi 2016-10-21 12:47:27 -07:00 committed by GitHub
commit 21e65eec08
1 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tools/functional-tester/etcd-tester/lease_stresser.go
View File

@ -24,11 +24,16 @@ import (
"github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes" "github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes"
pb "github.com/coreos/etcd/etcdserver/etcdserverpb" pb "github.com/coreos/etcd/etcdserver/etcdserverpb"
"golang.org/x/net/context" "golang.org/x/net/context"
"golang.org/x/time/rate"
"google.golang.org/grpc" "google.golang.org/grpc"
) )
const (
// time to live for lease // time to live for lease
const TTL = 30 TTL = 30
// leasesStressRoundPs indicates the rate that leaseStresser.run() creates and deletes leases per second
leasesStressRoundPs = 1
)
type leaseStressConfig struct { type leaseStressConfig struct {
numLeases int numLeases int
@ -44,6 +49,8 @@ type leaseStresser struct {
lc pb.LeaseClient lc pb.LeaseClient
ctx context.Context ctx context.Context
rateLimiter *rate.Limiter
success int success int
failure int failure int
numLeases int numLeases int
@ -115,10 +122,13 @@ func newLeaseStresserBuilder(s string, lsConfig *leaseStressConfig) leaseStresse
} }
case "default": case "default":
return func(mem *member) Stresser { return func(mem *member) Stresser {
// limit lease stresser to run 1 round per second
l := rate.NewLimiter(rate.Limit(leasesStressRoundPs), leasesStressRoundPs)
return &leaseStresser{ return &leaseStresser{
endpoint: mem.grpcAddr(), endpoint: mem.grpcAddr(),
numLeases: lsConfig.numLeases, numLeases: lsConfig.numLeases,
keysPerLease: lsConfig.keysPerLease, keysPerLease: lsConfig.keysPerLease,
rateLimiter: l,
} }
} }
default: default:
@ -170,7 +180,10 @@ func (ls *leaseStresser) Stress() error {
func (ls *leaseStresser) run() { func (ls *leaseStresser) run() {
defer ls.runWg.Done() defer ls.runWg.Done()
ls.restartKeepAlives() ls.restartKeepAlives()
for ls.ctx.Err() == nil { for {
if err := ls.rateLimiter.Wait(ls.ctx); err == context.Canceled {
return
}
plog.Debugf("creating lease on %v", ls.endpoint) plog.Debugf("creating lease on %v", ls.endpoint)
ls.createLeases() ls.createLeases()
plog.Debugf("done creating lease on %v", ls.endpoint) plog.Debugf("done creating lease on %v", ls.endpoint)