Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8066 from fanminshi/keepAlive_Close_to_close

Browse Source 
clientv3: change Close() to close() for keepAlive and watchGrpcStream
This commit is contained in:
fanmin shi 2017-06-08 14:59:24 -07:00 committed by GitHub
commit a8c073c51e
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
clientv3/lease.go
View File

@ -386,7 +386,7 @@ func (l *lessor) recvKeepAliveLoop() (gerr error) {
close(l.donec) close(l.donec)
l.loopErr = gerr l.loopErr = gerr
for _, ka := range l.keepAlives { for _, ka := range l.keepAlives {
ka.Close() ka.close()
} }
l.keepAlives = make(map[LeaseID]*keepAlive) l.keepAlives = make(map[LeaseID]*keepAlive)
l.mu.Unlock() l.mu.Unlock()
@ -467,7 +467,7 @@ func (l *lessor) recvKeepAlive(resp *pb.LeaseKeepAliveResponse) {
if karesp.TTL <= 0 { if karesp.TTL <= 0 {
// lease expired; close all keep alive channels // lease expired; close all keep alive channels
delete(l.keepAlives, karesp.ID) delete(l.keepAlives, karesp.ID)
ka.Close() ka.close()
return return
} }
@ -497,7 +497,7 @@ func (l *lessor) deadlineLoop() {
for id, ka := range l.keepAlives { for id, ka := range l.keepAlives {
if ka.deadline.Before(now) { if ka.deadline.Before(now) {
// waited too long for response; lease may be expired // waited too long for response; lease may be expired
ka.Close() ka.close()
delete(l.keepAlives, id) delete(l.keepAlives, id)
} }
} }
@ -539,7 +539,7 @@ func (l *lessor) sendKeepAliveLoop(stream pb.Lease_LeaseKeepAliveClient) {
} }
} }
func (ka *keepAlive) Close() { func (ka *keepAlive) close() {
close(ka.donec) close(ka.donec)
for _, ch := range ka.chs { for _, ch := range ka.chs {
close(ch) close(ch)

4
clientv3/watch.go
View File

@ -317,14 +317,14 @@ func (w *watcher) Close() (err error) {
w.streams = nil w.streams = nil
w.mu.Unlock() w.mu.Unlock()
for _, wgs := range streams { for _, wgs := range streams {
if werr := wgs.Close(); werr != nil { if werr := wgs.close(); werr != nil {
err = werr err = werr
} }
} }
return err return err
} }
func (w *watchGrpcStream) Close() (err error) { func (w *watchGrpcStream) close() (err error) {
w.cancel() w.cancel()
<-w.donec <-w.donec
select { select {