From 3fc18c53a32be1ea85480656ba44b65ca26dced0 Mon Sep 17 00:00:00 2001 From: smellthemoon <64083300+smellthemoon@users.noreply.github.com> Date: Wed, 2 Aug 2023 11:01:07 +0800 Subject: [PATCH] Fix wrong log (#26022) Signed-off-by: lixinguo Co-authored-by: lixinguo --- internal/querynodev2/handlers.go | 8 ++++---- internal/querynodev2/services_test.go | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/querynodev2/handlers.go b/internal/querynodev2/handlers.go index b22a0bfb2..424589343 100644 --- a/internal/querynodev2/handlers.go +++ b/internal/querynodev2/handlers.go @@ -175,8 +175,8 @@ func (node *QueryNode) queryChannel(ctx context.Context, req *querypb.QueryReque // get delegator sd, ok := node.delegators.Get(channel) if !ok { - err := merr.WrapErrServiceUnavailable("failed to get query shard delegator") - log.Warn("Query failed, failed to get query shard delegator", zap.Error(err)) + err := merr.WrapErrServiceUnavailable("failed to get shard delegator for query") + log.Warn("Query failed, failed to get shard delegator for query", zap.Error(err)) failRet.Status = merr.Status(err) return failRet, nil } @@ -326,8 +326,8 @@ func (node *QueryNode) searchChannel(ctx context.Context, req *querypb.SearchReq // get delegator sd, ok := node.delegators.Get(channel) if !ok { - err := merr.WrapErrServiceUnavailable("failed to get query shard delegator") - log.Warn("Query failed, failed to get query shard delegator", zap.Error(err)) + err := merr.WrapErrServiceUnavailable("failed to get shard delegator for search") + log.Warn("Query failed, failed to get shard delegator for search", zap.Error(err)) failRet.Status.Reason = err.Error() return failRet, err } diff --git a/internal/querynodev2/services_test.go b/internal/querynodev2/services_test.go index 558b92da6..91f86ff3a 100644 --- a/internal/querynodev2/services_test.go +++ b/internal/querynodev2/services_test.go @@ -1170,7 +1170,7 @@ func (suite *ServiceSuite) TestSearch_Failed() { resp, err = suite.node.Search(ctx, req) suite.NoError(err) suite.Equal(commonpb.ErrorCode_UnexpectedError, resp.GetStatus().GetErrorCode()) - suite.Contains(resp.GetStatus().GetReason(), "failed to get query shard delegator") + suite.Contains(resp.GetStatus().GetReason(), merr.ErrServiceUnavailable.Error()) suite.TestWatchDmChannelsInt64() suite.TestLoadSegments_Int64() @@ -1269,7 +1269,7 @@ func (suite *ServiceSuite) TestQuery_Failed() { resp, err := suite.node.Query(ctx, req) suite.NoError(err) suite.Equal(commonpb.ErrorCode_UnexpectedError, resp.GetStatus().GetErrorCode()) - suite.Contains(resp.GetStatus().GetReason(), "failed to get query shard delegator") + suite.Contains(resp.GetStatus().GetReason(), merr.ErrServiceUnavailable.Error()) suite.TestWatchDmChannelsInt64() suite.TestLoadSegments_Int64() -- GitLab