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

proxy/grpcproxy: deprecate "grpc.ErrClientConnClosing"

Browse Source 
Signed-off-by: Gyuho Lee <leegyuho@amazon.com>
This commit is contained in:
Gyuho Lee 2019-08-05 00:06:59 -07:00
parent 0bd27ea963
commit 9b2f18c6fb
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
proxy/grpcproxy/adapter/chan_stream.go
View File

@ -18,7 +18,9 @@ import (
"context" "context"
"google.golang.org/grpc" "google.golang.org/grpc"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/metadata" "google.golang.org/grpc/metadata"
"google.golang.org/grpc/status"
) )
// chanServerStream implements grpc.ServerStream with a chanStream // chanServerStream implements grpc.ServerStream with a chanStream
@ -120,7 +122,7 @@ func (s *chanStream) RecvMsg(m interface{}) error {
select { select {
case msg, ok := <-s.recvc: case msg, ok := <-s.recvc:
if !ok { if !ok {
return grpc.ErrClientConnClosing return status.Error(codes.Canceled, "the client connection is closing")
} }
if err, ok := msg.(error); ok { if err, ok := msg.(error); ok {
return err return err

4
proxy/grpcproxy/lease.go
View File

@ -26,7 +26,9 @@ import (
pb "go.etcd.io/etcd/etcdserver/etcdserverpb" pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
"google.golang.org/grpc" "google.golang.org/grpc"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/metadata" "google.golang.org/grpc/metadata"
"google.golang.org/grpc/status"
) )
type leaseProxy struct { type leaseProxy struct {
@ -214,7 +216,7 @@ func (lp *leaseProxy) LeaseKeepAlive(stream pb.Lease_LeaseKeepAliveServer) error
case <-lostLeaderC: case <-lostLeaderC:
return rpctypes.ErrNoLeader return rpctypes.ErrNoLeader
case <-lp.leader.disconnectNotify(): case <-lp.leader.disconnectNotify():
return grpc.ErrClientConnClosing return status.Error(codes.Canceled, "the client connection is closing")
default: default:
if err != nil { if err != nil {
return err return err

7
proxy/grpcproxy/watch.go
View File

@ -23,8 +23,9 @@ import (
"go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes" "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes"
pb "go.etcd.io/etcd/etcdserver/etcdserverpb" pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
"google.golang.org/grpc" "google.golang.org/grpc/codes"
"google.golang.org/grpc/metadata" "google.golang.org/grpc/metadata"
"google.golang.org/grpc/status"
) )
type watchProxy struct { type watchProxy struct {
@ -80,7 +81,7 @@ func (wp *watchProxy) Watch(stream pb.Watch_WatchServer) (err error) {
wp.mu.Unlock() wp.mu.Unlock()
select { select {
case <-wp.leader.disconnectNotify(): case <-wp.leader.disconnectNotify():
return grpc.ErrClientConnClosing return status.Error(codes.Canceled, "the client connection is closing")
default: default:
return wp.ctx.Err() return wp.ctx.Err()
} }
@ -153,7 +154,7 @@ func (wp *watchProxy) Watch(stream pb.Watch_WatchServer) (err error) {
case <-lostLeaderC: case <-lostLeaderC:
return rpctypes.ErrNoLeader return rpctypes.ErrNoLeader
case <-wp.leader.disconnectNotify(): case <-wp.leader.disconnectNotify():
return grpc.ErrClientConnClosing return status.Error(codes.Canceled, "the client connection is closing")
default: default:
return wps.ctx.Err() return wps.ctx.Err()
} }