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

grpcproxy: fix "grpc.ErrClientConnClosing" handling

Browse Source 
Fix

```
go test -v -tags cluster_proxy -run TestWatchErrConnClosed
```

with gRPC >= v1.10

Signed-off-by: Gyuho Lee <gyuhox@gmail.com>
This commit is contained in:
Gyuho Lee 2018-06-15 07:31:23 -07:00
parent 6e521d2f3f
commit d922069713
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
proxy/grpcproxy/leader.go
View File

@ -20,10 +20,8 @@ import (
"sync" "sync"
"github.com/coreos/etcd/clientv3" "github.com/coreos/etcd/clientv3"
"github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes"
"golang.org/x/time/rate" "golang.org/x/time/rate"
"google.golang.org/grpc"
) )
const ( const (
@ -69,7 +67,7 @@ func (l *leader) recvLoop() {
} }
if cresp.Err() != nil { if cresp.Err() != nil {
l.loseLeader() l.loseLeader()
if rpctypes.ErrorDesc(cresp.Err()) == grpc.ErrClientConnClosing.Error() { if clientv3.IsConnCanceled(cresp.Err()) {
close(l.disconnc) close(l.disconnc)
return return
} }