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

clientv3: use retryConnection

Browse Source
This commit is contained in:
Xiang Li
2016-01-27 21:13:23 -08:00
parent 3df91f85c4
commit a3b7876a3c
4 changed files with 46 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
etcdserver/api/v3rpc/key.go
View File

@@ -215,6 +215,6 @@ func togRPCError(err error) error {
return ErrFutureRev
// TODO: handle error from raft and timeout
default:
return grpc.Errorf(codes.Unknown, err.Error())
return grpc.Errorf(codes.Internal, err.Error())
}
}

6
etcdserver/api/v3rpc/member.go
View File

@@ -54,7 +54,7 @@ func (cs *ClusterServer) MemberAdd(ctx context.Context, r *pb.MemberAddRequest)
case err == etcdserver.ErrPeerURLexists:
return nil, ErrPeerURLExist
case err != nil:
return nil, grpc.Errorf(codes.Unknown, err.Error())
return nil, grpc.Errorf(codes.Internal, err.Error())
}
return &pb.MemberAddResponse{
@@ -71,7 +71,7 @@ func (cs *ClusterServer) MemberRemove(ctx context.Context, r *pb.MemberRemoveReq
case err == etcdserver.ErrIDNotFound:
return nil, ErrMemberNotFound
case err != nil:
return nil, grpc.Errorf(codes.Unknown, err.Error())
return nil, grpc.Errorf(codes.Internal, err.Error())
}
return &pb.MemberRemoveResponse{Header: cs.header()}, nil
@@ -89,7 +89,7 @@ func (cs *ClusterServer) MemberUpdate(ctx context.Context, r *pb.MemberUpdateReq
case err == etcdserver.ErrIDNotFound:
return nil, ErrMemberNotFound
case err != nil:
return nil, grpc.Errorf(codes.Unknown, err.Error())
return nil, grpc.Errorf(codes.Internal, err.Error())
}
return &pb.MemberUpdateResponse{Header: cs.header()}, nil