Merge pull request #6382 from heyitsanthony/unhealthy-err

v3api, rpctypes: add ErrUnhealthy
etcd-io · Sep 8, 2016 · 4563efd · 4563efd
2 parents 0cc2f82 + 1defeda
commit 4563efd
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/etcdserver/api/v3rpc/rpctypes/error.go b/etcdserver/api/v3rpc/rpctypes/error.go
@@ -56,6 +56,7 @@ var (
 	ErrGRPCStopped                = grpc.Errorf(codes.Unavailable, "etcdserver: server stopped")
 	ErrGRPCTimeout                = grpc.Errorf(codes.Unavailable, "etcdserver: request timed out")
 	ErrGRPCTimeoutDueToLeaderFail = grpc.Errorf(codes.Unavailable, "etcdserver: request timed out, possibly due to previous leader failure")
+	ErrGRPCUnhealthy              = grpc.Errorf(codes.Unavailable, "etcdserver: unhealthy cluster")
 
 	errStringToError = map[string]error{
 		grpc.ErrorDesc(ErrGRPCEmptyKey):     ErrGRPCEmptyKey,
@@ -93,6 +94,7 @@ var (
 		grpc.ErrorDesc(ErrGRPCStopped):                ErrGRPCStopped,
 		grpc.ErrorDesc(ErrGRPCTimeout):                ErrGRPCTimeout,
 		grpc.ErrorDesc(ErrGRPCTimeoutDueToLeaderFail): ErrGRPCTimeoutDueToLeaderFail,
+		grpc.ErrorDesc(ErrGRPCUnhealthy):              ErrGRPCUnhealthy,
 	}
 
 	// client-side error
@@ -131,6 +133,7 @@ var (
 	ErrStopped                = Error(ErrGRPCStopped)
 	ErrTimeout                = Error(ErrGRPCTimeout)
 	ErrTimeoutDueToLeaderFail = Error(ErrGRPCTimeoutDueToLeaderFail)
+	ErrUnhealthy              = Error(ErrGRPCUnhealthy)
 )
 
 // EtcdError defines gRPC server errors.

diff --git a/etcdserver/api/v3rpc/util.go b/etcdserver/api/v3rpc/util.go
@@ -57,6 +57,8 @@ func togRPCError(err error) error {
 		return rpctypes.ErrGRPCTimeout
 	case etcdserver.ErrTimeoutDueToLeaderFail:
 		return rpctypes.ErrGRPCTimeoutDueToLeaderFail
+	case etcdserver.ErrUnhealthy:
+		return rpctypes.ErrGRPCUnhealthy
 
 	case auth.ErrRootUserNotExist:
 		return rpctypes.ErrGRPCRootUserNotExist