Revert "Merge pull request #7732 from heyitsanthony/lease-err-ka"
This reverts commitfbbc4a4979
, reversing changes made tof254e38385
. Fixes #7851
This commit is contained in:
@ -255,7 +255,10 @@ func (lps *leaseProxyStream) recvLoop() error {
|
||||
func (lps *leaseProxyStream) keepAliveLoop(leaseID int64, neededResps *atomicCounter) error {
|
||||
cctx, ccancel := context.WithCancel(lps.ctx)
|
||||
defer ccancel()
|
||||
respc := lps.lessor.KeepAlive(cctx, clientv3.LeaseID(leaseID))
|
||||
respc, err := lps.lessor.KeepAlive(cctx, clientv3.LeaseID(leaseID))
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
// ticker expires when loop hasn't received keepalive within TTL
|
||||
var ticker <-chan time.Time
|
||||
for {
|
||||
@ -273,7 +276,7 @@ func (lps *leaseProxyStream) keepAliveLoop(leaseID int64, neededResps *atomicCou
|
||||
lps.mu.Unlock()
|
||||
return nil
|
||||
case rp, ok := <-respc:
|
||||
if !ok || rp.Err != nil {
|
||||
if !ok {
|
||||
lps.mu.Lock()
|
||||
delete(lps.keepAliveLeases, leaseID)
|
||||
lps.mu.Unlock()
|
||||
|
Reference in New Issue
Block a user