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

Merge pull request #7281 from heyitsanthony/no-default-ka 

clientv3: only start lease stream after first keepalive call
release-3.2
Anthony Romano 2017-02-06 13:51:43 -08:00 committed by GitHub
parent 6fb99a8585 a9f10bdeee
commit 739accc242
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
clientv3/lease.go
View File

@ -126,6 +126,9 @@ type lessor struct {
// firstKeepAliveTimeout is the timeout for the first keepalive request // firstKeepAliveTimeout is the timeout for the first keepalive request
// before the actual TTL is known to the lease client // before the actual TTL is known to the lease client
firstKeepAliveTimeout time.Duration firstKeepAliveTimeout time.Duration
// firstKeepAliveOnce ensures stream starts after first KeepAlive call.
firstKeepAliveOnce sync.Once
} }
// keepAlive multiplexes a keepalive for a lease over multiple channels // keepAlive multiplexes a keepalive for a lease over multiple channels
@ -152,8 +155,6 @@ func NewLease(c *Client) Lease {
} }
l.stopCtx, l.stopCancel = context.WithCancel(context.Background()) l.stopCtx, l.stopCancel = context.WithCancel(context.Background())
go l.recvKeepAliveLoop()
go l.deadlineLoop()
return l return l
} }
@ -254,6 +255,10 @@ func (l *lessor) KeepAlive(ctx context.Context, id LeaseID) (<-chan *LeaseKeepAl
l.mu.Unlock() l.mu.Unlock()
go l.keepAliveCtxCloser(id, ctx, ka.donec) go l.keepAliveCtxCloser(id, ctx, ka.donec)
l.firstKeepAliveOnce.Do(func() {
go l.recvKeepAliveLoop()
go l.deadlineLoop()
})
return ch, nil return ch, nil
} }
@ -279,6 +284,8 @@ func (l *lessor) KeepAliveOnce(ctx context.Context, id LeaseID) (*LeaseKeepAlive
func (l *lessor) Close() error { func (l *lessor) Close() error {
l.stopCancel() l.stopCancel()
// close for synchronous teardown if stream goroutines never launched
l.firstKeepAliveOnce.Do(func() { close(l.donec) })
<-l.donec <-l.donec
return nil return nil
} }