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