From c76f91233f2c82ff4ac32ae9259dbbace2af4689 Mon Sep 17 00:00:00 2001 From: congqixia Date: Wed, 15 Sep 2021 21:05:52 +0800 Subject: [PATCH] Put errors together (#7958) Signed-off-by: Congqi Xia --- internal/datacoord/errors.go | 11 +++++++++++ internal/datacoord/server.go | 2 -- internal/datacoord/services.go | 2 -- internal/datacoord/util.go | 4 ---- 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/internal/datacoord/errors.go b/internal/datacoord/errors.go index 7f565f9ba1..49536b8fef 100644 --- a/internal/datacoord/errors.go +++ b/internal/datacoord/errors.go @@ -16,6 +16,17 @@ import ( "fmt" ) +// errNilKvClient stands for a nil kv client is detected when initialized +var errNilKvClient = errors.New("kv client not initialized") + +// serverNotServingErrMsg used for Status Reason when datacoord is not healthy +const serverNotServingErrMsg = "server is not serving" + +// errors for VerifyResponse +var errNilResponse = errors.New("response is nil") +var errNilStatusResponse = errors.New("response has nil status") +var errUnknownResponseType = errors.New("unknown response type") + func msgDataCoordIsUnhealthy(coordID UniqueID) string { return fmt.Sprintf("data coord %d is not ready", coordID) } diff --git a/internal/datacoord/server.go b/internal/datacoord/server.go index 473d5920c7..2716a92b49 100644 --- a/internal/datacoord/server.go +++ b/internal/datacoord/server.go @@ -58,8 +58,6 @@ type ( Timestamp = typeutil.Timestamp ) -var errNilKvClient = errors.New("kv client not initialized") - // ServerState type alias, presents datacoord Server State type ServerState = int64 diff --git a/internal/datacoord/services.go b/internal/datacoord/services.go index 03d59a0bc8..4fe9fbfe0f 100644 --- a/internal/datacoord/services.go +++ b/internal/datacoord/services.go @@ -15,8 +15,6 @@ import ( "go.uber.org/zap" ) -const serverNotServingErrMsg = "server is not serving" - // checks whether server in Healthy State func (s *Server) isClosed() bool { return atomic.LoadInt64(&s.isServing) != ServerStateHealthy diff --git a/internal/datacoord/util.go b/internal/datacoord/util.go index a7b5bb9d4c..0a7c745532 100644 --- a/internal/datacoord/util.go +++ b/internal/datacoord/util.go @@ -25,10 +25,6 @@ type Response interface { GetStatus() *commonpb.Status } -var errNilResponse = errors.New("response is nil") -var errNilStatusResponse = errors.New("response has nil status") -var errUnknownResponseType = errors.New("unknown response type") - // VerifyResponse verify grpc Response 1. check error is nil 2. check response.GetStatus() with status success func VerifyResponse(response interface{}, err error) error { if err != nil {