Browse Source

etcdserver: use 'TTL()' on lease.Lease

Gyu-Ho Lee 9 years ago
parent
commit
65ac718a11
2 changed files with 2 additions and 2 deletions
  1. 1 1
      etcdserver/apply.go
  2. 1 1
      etcdserver/v3_server.go

+ 1 - 1
etcdserver/apply.go

@@ -508,7 +508,7 @@ func (a *applierV3backend) LeaseGrant(lc *pb.LeaseGrantRequest) (*pb.LeaseGrantR
 	resp := &pb.LeaseGrantResponse{}
 	resp := &pb.LeaseGrantResponse{}
 	if err == nil {
 	if err == nil {
 		resp.ID = int64(l.ID)
 		resp.ID = int64(l.ID)
-		resp.TTL = l.TTL
+		resp.TTL = l.TTL()
 		resp.Header = &pb.ResponseHeader{Revision: a.s.KV().Rev()}
 		resp.Header = &pb.ResponseHeader{Revision: a.s.KV().Rev()}
 	}
 	}
 
 

+ 1 - 1
etcdserver/v3_server.go

@@ -338,7 +338,7 @@ func (s *EtcdServer) LeaseTimeToLive(ctx context.Context, r *pb.LeaseTimeToLiveR
 			return nil, lease.ErrLeaseNotFound
 			return nil, lease.ErrLeaseNotFound
 		}
 		}
 		// TODO: fill out ResponseHeader
 		// TODO: fill out ResponseHeader
-		resp := &pb.LeaseTimeToLiveResponse{Header: &pb.ResponseHeader{}, ID: r.ID, TTL: int64(le.Remaining().Seconds()), GrantedTTL: le.TTL}
+		resp := &pb.LeaseTimeToLiveResponse{Header: &pb.ResponseHeader{}, ID: r.ID, TTL: int64(le.Remaining().Seconds()), GrantedTTL: le.TTL()}
 		if r.Keys {
 		if r.Keys {
 			ks := le.Keys()
 			ks := le.Keys()
 			kbs := make([][]byte, len(ks))
 			kbs := make([][]byte, len(ks))