vitalif
/
etcd
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lease: add limit in lessor.findExpiredLeases function 

Function findExpiredLeases finds expired leases in the leaseMap until
reaching expired limit.
release-3.3
lorneli 2017-09-03 22:49:53 +08:00
parent 77a19cd9d4
commit 7063a5e5cc
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lease/lessor.go
View File

@ -478,17 +478,16 @@ func (le *lessor) runLoop() {
for {
var ls []*Lease
// rate limit
revokeLimit := leaseRevokeRate / 2
le.mu.Lock()
if le.isPrimary() {
ls = le.findExpiredLeases()
ls = le.findExpiredLeases(revokeLimit)
}
le.mu.Unlock()
if len(ls) != 0 {
// rate limit
if len(ls) > leaseRevokeRate/2 {
ls = ls[:leaseRevokeRate/2]
}
select {
case <-le.stopC:
return
@ -508,9 +507,9 @@ func (le *lessor) runLoop() {
}
}
// findExpiredLeases loops all the leases in the leaseMap and returns the expired
// leases that needed to be revoked.
func (le *lessor) findExpiredLeases() []*Lease {
// findExpiredLeases loops leases in the leaseMap until reaching expired limit
// and returns the expired leases that needed to be revoked.
func (le *lessor) findExpiredLeases(limit int) []*Lease {
leases := make([]*Lease, 0, 16)
for _, l := range le.leaseMap {
@ -518,6 +517,11 @@ func (le *lessor) findExpiredLeases() []*Lease {
// make up committing latency.
if l.expired() {
leases = append(leases, l)
// reach expired limit
if len(leases) == limit {
break
}
}
}