From 5e3e3b3b414cc4ce1c0968a313c0067d938d8172 Mon Sep 17 00:00:00 2001 From: godchen Date: Wed, 1 Dec 2021 22:17:46 +0800 Subject: [PATCH] Remove grpc returned error (#12537) Signed-off-by: godchen --- internal/datacoord/services.go | 2 +- internal/datanode/data_node.go | 2 +- internal/indexcoord/index_coord.go | 9 +++++++-- internal/indexnode/indexnode.go | 2 +- internal/proxy/impl.go | 4 ++-- 5 files changed, 12 insertions(+), 7 deletions(-) diff --git a/internal/datacoord/services.go b/internal/datacoord/services.go index a06e4b57fc..b4fa5b6dd5 100644 --- a/internal/datacoord/services.go +++ b/internal/datacoord/services.go @@ -693,7 +693,7 @@ func (s *Server) GetMetrics(ctx context.Context, req *milvuspb.GetMetricsRequest s.metricsCacheManager.UpdateSystemInfoMetrics(metrics) - return metrics, err + return metrics, nil } log.Debug("DataCoord.GetMetrics failed, request metric type is not implemented yet", diff --git a/internal/datanode/data_node.go b/internal/datanode/data_node.go index a20b880a79..a9263d0c30 100644 --- a/internal/datanode/data_node.go +++ b/internal/datanode/data_node.go @@ -724,7 +724,7 @@ func (node *DataNode) GetMetrics(ctx context.Context, req *milvuspb.GetMetricsRe zap.Any("systemInfoMetrics", systemInfoMetrics), // TODO(dragondriver): necessary? may be very large zap.Error(err)) - return systemInfoMetrics, err + return systemInfoMetrics, nil } log.Debug("DataNode.GetMetrics failed, request metric type is not implemented yet", diff --git a/internal/indexcoord/index_coord.go b/internal/indexcoord/index_coord.go index ffae51a999..32deb9f658 100644 --- a/internal/indexcoord/index_coord.go +++ b/internal/indexcoord/index_coord.go @@ -501,7 +501,12 @@ func (i *IndexCoord) GetIndexFilePaths(ctx context.Context, req *indexpb.GetInde for _, indexID := range req.IndexBuildIDs { indexPathInfo, err := i.metaTable.GetIndexFilePathInfo(indexID) if err != nil { - return nil, err + return &indexpb.GetIndexFilePathsResponse{ + Status: &commonpb.Status{ + ErrorCode: commonpb.ErrorCode_UnexpectedError, + Reason: err.Error(), + }, + }, nil } indexPaths = append(indexPaths, indexPathInfo) } @@ -577,7 +582,7 @@ func (i *IndexCoord) GetMetrics(ctx context.Context, req *milvuspb.GetMetricsReq i.metricsCacheManager.UpdateSystemInfoMetrics(metrics) - return metrics, err + return metrics, nil } log.Debug("IndexCoord.GetMetrics failed, request metric type is not implemented yet", diff --git a/internal/indexnode/indexnode.go b/internal/indexnode/indexnode.go index b121e83306..0d42120f8f 100644 --- a/internal/indexnode/indexnode.go +++ b/internal/indexnode/indexnode.go @@ -389,7 +389,7 @@ func (i *IndexNode) GetMetrics(ctx context.Context, req *milvuspb.GetMetricsRequ zap.Any("metrics", metrics), // TODO(dragondriver): necessary? may be very large zap.Error(err)) - return metrics, err + return metrics, nil } log.Warn("IndexNode.GetMetrics failed, request metric type is not implemented yet", diff --git a/internal/proxy/impl.go b/internal/proxy/impl.go index fe6efc8118..7c018f0d57 100644 --- a/internal/proxy/impl.go +++ b/internal/proxy/impl.go @@ -65,7 +65,7 @@ func (node *Proxy) GetComponentStates(ctx context.Context) (*internalpb.Componen ErrorCode: commonpb.ErrorCode_UnexpectedError, Reason: errMsg, } - return stats, errors.New(errMsg) + return stats, nil } nodeID := common.NotRegisteredID if node.session != nil && node.session.Registered() { @@ -2771,7 +2771,7 @@ func (node *Proxy) GetMetrics(ctx context.Context, req *milvuspb.GetMetricsReque node.metricsCacheManager.UpdateSystemInfoMetrics(metrics) - return metrics, err + return metrics, nil } log.Debug("Proxy.GetMetrics failed, request metric type is not implemented yet",