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 #7402 from heyitsanthony/fix-watchconnerr

Browse Source 
grpcproxy: return closing error when stream is canceled from conn close
This commit is contained in:
Anthony Romano 2017-03-01 21:56:36 -08:00 committed by GitHub
commit 2eb8243d94
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
proxy/grpcproxy/watch.go
View File

@ -73,7 +73,12 @@ func (wp *watchProxy) Watch(stream pb.Watch_WatchServer) (err error) {
select { select {
case <-wp.ctx.Done(): case <-wp.ctx.Done():
wp.mu.Unlock() wp.mu.Unlock()
return select {
case <-wp.leader.disconnectNotify():
return grpc.ErrClientConnClosing
default:
return wp.ctx.Err()
}
default: default:
wp.wg.Add(1) wp.wg.Add(1)
} }