api/v3rpc: deprecate grpc.Errorf
It's been deprecated as of grpc/grpc-go v1.6.x. Signed-off-by: Gyu-Ho Lee <gyuhox@gmail.com>release-3.3
parent
de950a40e0
commit
5d98710b2e
|
@ -22,12 +22,13 @@ import (
|
||||||
|
|
||||||
"google.golang.org/grpc"
|
"google.golang.org/grpc"
|
||||||
"google.golang.org/grpc/codes"
|
"google.golang.org/grpc/codes"
|
||||||
|
"google.golang.org/grpc/status"
|
||||||
)
|
)
|
||||||
|
|
||||||
// ErrNoAddrAvilable is returned by Get() when the balancer does not have
|
// ErrNoAddrAvilable is returned by Get() when the balancer does not have
|
||||||
// any active connection to endpoints at the time.
|
// any active connection to endpoints at the time.
|
||||||
// This error is returned only when opts.BlockingWait is true.
|
// This error is returned only when opts.BlockingWait is true.
|
||||||
var ErrNoAddrAvilable = grpc.Errorf(codes.Unavailable, "there is no address available")
|
var ErrNoAddrAvilable = status.Error(codes.Unavailable, "there is no address available")
|
||||||
|
|
||||||
type notifyMsg int
|
type notifyMsg int
|
||||||
|
|
||||||
|
|
|
@ -21,9 +21,9 @@ import (
|
||||||
|
|
||||||
etcd "github.com/coreos/etcd/clientv3"
|
etcd "github.com/coreos/etcd/clientv3"
|
||||||
|
|
||||||
"google.golang.org/grpc"
|
|
||||||
"google.golang.org/grpc/codes"
|
"google.golang.org/grpc/codes"
|
||||||
"google.golang.org/grpc/naming"
|
"google.golang.org/grpc/naming"
|
||||||
|
"google.golang.org/grpc/status"
|
||||||
)
|
)
|
||||||
|
|
||||||
var ErrWatcherClosed = fmt.Errorf("naming: watch closed")
|
var ErrWatcherClosed = fmt.Errorf("naming: watch closed")
|
||||||
|
@ -39,13 +39,13 @@ func (gr *GRPCResolver) Update(ctx context.Context, target string, nm naming.Upd
|
||||||
case naming.Add:
|
case naming.Add:
|
||||||
var v []byte
|
var v []byte
|
||||||
if v, err = json.Marshal(nm); err != nil {
|
if v, err = json.Marshal(nm); err != nil {
|
||||||
return grpc.Errorf(codes.InvalidArgument, err.Error())
|
return status.Error(codes.InvalidArgument, err.Error())
|
||||||
}
|
}
|
||||||
_, err = gr.Client.KV.Put(ctx, target+"/"+nm.Addr, string(v), opts...)
|
_, err = gr.Client.KV.Put(ctx, target+"/"+nm.Addr, string(v), opts...)
|
||||||
case naming.Delete:
|
case naming.Delete:
|
||||||
_, err = gr.Client.Delete(ctx, target+"/"+nm.Addr, opts...)
|
_, err = gr.Client.Delete(ctx, target+"/"+nm.Addr, opts...)
|
||||||
default:
|
default:
|
||||||
return grpc.Errorf(codes.InvalidArgument, "naming: bad naming op")
|
return status.Error(codes.InvalidArgument, "naming: bad naming op")
|
||||||
}
|
}
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
@ -80,7 +80,7 @@ func (gw *gRPCWatcher) Next() ([]*naming.Update, error) {
|
||||||
// process new events on target/*
|
// process new events on target/*
|
||||||
wr, ok := <-gw.wch
|
wr, ok := <-gw.wch
|
||||||
if !ok {
|
if !ok {
|
||||||
gw.err = grpc.Errorf(codes.Unavailable, "%s", ErrWatcherClosed)
|
gw.err = status.Error(codes.Unavailable, ErrWatcherClosed.Error())
|
||||||
return nil, gw.err
|
return nil, gw.err
|
||||||
}
|
}
|
||||||
if gw.err = wr.Err(); gw.err != nil {
|
if gw.err = wr.Err(); gw.err != nil {
|
||||||
|
|
|
@ -27,6 +27,7 @@ import (
|
||||||
"google.golang.org/grpc"
|
"google.golang.org/grpc"
|
||||||
"google.golang.org/grpc/codes"
|
"google.golang.org/grpc/codes"
|
||||||
"google.golang.org/grpc/metadata"
|
"google.golang.org/grpc/metadata"
|
||||||
|
"google.golang.org/grpc/status"
|
||||||
)
|
)
|
||||||
|
|
||||||
const (
|
const (
|
||||||
|
@ -91,7 +92,7 @@ func (wr *WatchResponse) Err() error {
|
||||||
return v3rpc.ErrCompacted
|
return v3rpc.ErrCompacted
|
||||||
case wr.Canceled:
|
case wr.Canceled:
|
||||||
if len(wr.cancelReason) != 0 {
|
if len(wr.cancelReason) != 0 {
|
||||||
return v3rpc.Error(grpc.Errorf(codes.FailedPrecondition, "%s", wr.cancelReason))
|
return v3rpc.Error(status.Error(codes.FailedPrecondition, wr.cancelReason))
|
||||||
}
|
}
|
||||||
return v3rpc.ErrFutureRev
|
return v3rpc.ErrFutureRev
|
||||||
}
|
}
|
||||||
|
|
|
@ -21,8 +21,8 @@ import (
|
||||||
"github.com/coreos/etcd/etcdserver/membership"
|
"github.com/coreos/etcd/etcdserver/membership"
|
||||||
"github.com/coreos/etcd/lease"
|
"github.com/coreos/etcd/lease"
|
||||||
"github.com/coreos/etcd/mvcc"
|
"github.com/coreos/etcd/mvcc"
|
||||||
"google.golang.org/grpc"
|
|
||||||
"google.golang.org/grpc/codes"
|
"google.golang.org/grpc/codes"
|
||||||
|
"google.golang.org/grpc/status"
|
||||||
)
|
)
|
||||||
|
|
||||||
var toGRPCErrorMap = map[error]error{
|
var toGRPCErrorMap = map[error]error{
|
||||||
|
@ -70,7 +70,7 @@ var toGRPCErrorMap = map[error]error{
|
||||||
func togRPCError(err error) error {
|
func togRPCError(err error) error {
|
||||||
grpcErr, ok := toGRPCErrorMap[err]
|
grpcErr, ok := toGRPCErrorMap[err]
|
||||||
if !ok {
|
if !ok {
|
||||||
return grpc.Errorf(codes.Unknown, err.Error())
|
return status.Error(codes.Unknown, err.Error())
|
||||||
}
|
}
|
||||||
return grpcErr
|
return grpcErr
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue