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

grpcproxy: use new lease interface

release-3.2
Anthony Romano 2017-04-17 15:10:25 -07:00
parent 70f0bbe38c
commit b5384ac1c0
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
proxy/grpcproxy/lease.go
View File

@ -255,10 +255,7 @@ func (lps *leaseProxyStream) recvLoop() error {
func (lps *leaseProxyStream) keepAliveLoop(leaseID int64, neededResps *atomicCounter) error {
cctx, ccancel := context.WithCancel(lps.ctx)
defer ccancel()
respc, err := lps.lessor.KeepAlive(cctx, clientv3.LeaseID(leaseID))
if err != nil {
return err
}
respc := lps.lessor.KeepAlive(cctx, clientv3.LeaseID(leaseID))
// ticker expires when loop hasn't received keepalive within TTL
var ticker <-chan time.Time
for {
@ -276,7 +273,7 @@ func (lps *leaseProxyStream) keepAliveLoop(leaseID int64, neededResps *atomicCou
lps.mu.Unlock()
return nil
case rp, ok := <-respc:
if !ok {
if !ok || rp.Err != nil {
lps.mu.Lock()
delete(lps.keepAliveLeases, leaseID)
lps.mu.Unlock()