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

etcd-tester: check expired lease with -1 TTL

Browse Source 
Following the change at 2ca1823a96

Signed-off-by: Gyu-Ho Lee <gyuhox@gmail.com>
This commit is contained in:
Gyu-Ho Lee 2017-03-03 10:44:48 -08:00
parent 85c22f4562
commit fb81fb44fa
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tools/functional-tester/etcd-tester/checks.go
View File

@ -133,7 +133,8 @@ func (lc *leaseChecker) checkShortLivedLease(ctx context.Context, leaseID int64)
var resp *pb.LeaseTimeToLiveResponse var resp *pb.LeaseTimeToLiveResponse
for i := 0; i < retries; i++ { for i := 0; i < retries; i++ {
resp, err = lc.getLeaseByID(ctx, leaseID) resp, err = lc.getLeaseByID(ctx, leaseID)
if rpctypes.Error(err) == rpctypes.ErrLeaseNotFound { // lease not found, for ~v3.1 compatibilities, check ErrLeaseNotFound
if (err == nil && resp.TTL == -1) || (err != nil && rpctypes.Error(err) == rpctypes.ErrLeaseNotFound) {
return nil return nil
} }
if err != nil { if err != nil {
@ -195,11 +196,13 @@ func (lc *leaseChecker) hasLeaseExpired(ctx context.Context, leaseID int64) (boo
// keep retrying until lease's state is known or ctx is being canceled // keep retrying until lease's state is known or ctx is being canceled
for ctx.Err() == nil { for ctx.Err() == nil {
resp, err := lc.getLeaseByID(ctx, leaseID) resp, err := lc.getLeaseByID(ctx, leaseID)
if err == nil { if err != nil {
return false, nil // for ~v3.1 compatibilities
} if rpctypes.Error(err) == rpctypes.ErrLeaseNotFound {
if rpctypes.Error(err) == rpctypes.ErrLeaseNotFound { return true, nil
return true, nil }
} else {
return resp.TTL == -1, nil
} }
plog.Warningf("hasLeaseExpired %v resp %v error %v (endpoint %q)", leaseID, resp, err, lc.endpoint) plog.Warningf("hasLeaseExpired %v resp %v error %v (endpoint %q)", leaseID, resp, err, lc.endpoint)
} }