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 #8490 from lorneli/lease_dev

Browse Source 
lease: fix typo and modify findExpiredLeases function
This commit is contained in:
Xiang Li 2017-09-06 12:47:25 -07:00 committed by GitHub
commit 05d7dc307b
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lease/doc.go
View File

@ -12,5 +12,5 @@
// See the License for the specific language governing permissions and
// limitations under the License.
// Package lease provides an interface and implemetation for time-limited leases over arbitrary resources.
// Package lease provides an interface and implementation for time-limited leases over arbitrary resources.
package lease

24
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
}
}
}
@ -649,9 +653,9 @@ func (fl *FakeLessor) Demote() {}
func (fl *FakeLessor) Renew(id LeaseID) (int64, error) { return 10, nil }
func (le *FakeLessor) Lookup(id LeaseID) *Lease { return nil }
func (fl *FakeLessor) Lookup(id LeaseID) *Lease { return nil }
func (le *FakeLessor) Leases() []*Lease { return nil }
func (fl *FakeLessor) Leases() []*Lease { return nil }
func (fl *FakeLessor) ExpiredLeasesC() <-chan []*Lease { return nil }