etcdserver: respond with ttl=0 for revoked lease keep alive

Fixes #5172
2016-04-26 11:53:36 -07:00
parent d923b59190
commit af1a0b60e2
3 changed files with 52 additions and 2 deletions
--- a/etcdserver/api/v3rpc/lease.go
+++ b/etcdserver/api/v3rpc/lease.go
@ -60,10 +60,11 @@ func (ls *LeaseServer) LeaseKeepAlive(stream pb.Lease_LeaseKeepAliveServer) erro

 		ttl, err := ls.le.LeaseRenew(lease.LeaseID(req.ID))
 		if err == lease.ErrLeaseNotFound {
-			return rpctypes.ErrLeaseNotFound
+			err = nil
+			ttl = 0
 		}

-		if err != nil && err != lease.ErrLeaseNotFound {
+		if err != nil {
 			return err
 		}