Skip to content

Commit

Permalink
integration: close proxy's lease client
Browse files Browse the repository at this point in the history
  • Loading branch information
Anthony Romano committed Apr 25, 2017
1 parent cb8524f commit 2fd6df9
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions integration/cluster_proxy.go
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ type proxyCloser struct {
clientv3.Watcher
wdonec <-chan struct{}
kvdonec <-chan struct{}
lclose func()
lpdonec <-chan struct{}
}

Expand All @@ -83,6 +84,7 @@ func (pc *proxyCloser) Close() error {
<-pc.kvdonec
err := pc.Watcher.Close()
<-pc.wdonec
pc.lclose()
<-pc.lpdonec
return err
}
Expand All @@ -95,11 +97,13 @@ func newClientV3(cfg clientv3.Config) (*clientv3.Client, error) {
rpc := toGRPC(c)
c.KV = clientv3.NewKVFromKVClient(rpc.KV)
pmu.Lock()
lc := c.Lease
c.Lease = clientv3.NewLeaseFromLeaseClient(rpc.Lease, cfg.DialTimeout)
c.Watcher = &proxyCloser{
Watcher: clientv3.NewWatchFromWatchClient(rpc.Watch),
wdonec: proxies[c].wdonec,
kvdonec: proxies[c].kvdonec,
lclose: func() { lc.Close() },
lpdonec: proxies[c].lpdonec,
}
pmu.Unlock()
Expand Down

0 comments on commit 2fd6df9

Please sign in to comment.