未验证 提交 d5ec7dda 编写于 作者: W wei liu 提交者: GitHub

fix metric label in search/query count (#25377)

Signed-off-by: NWei Liu <wei.liu@zilliz.com>
上级 3f9384b5
...@@ -119,7 +119,7 @@ func (node *QueryNode) queryChannel(ctx context.Context, req *querypb.QueryReque ...@@ -119,7 +119,7 @@ func (node *QueryNode) queryChannel(ctx context.Context, req *querypb.QueryReque
metrics.QueryNodeSQCount.WithLabelValues(fmt.Sprint(paramtable.GetNodeID()), metrics.QueryLabel, metrics.TotalLabel, metrics.Leader).Inc() metrics.QueryNodeSQCount.WithLabelValues(fmt.Sprint(paramtable.GetNodeID()), metrics.QueryLabel, metrics.TotalLabel, metrics.Leader).Inc()
defer func() { defer func() {
if failRet.Status.ErrorCode != commonpb.ErrorCode_Success { if failRet.Status.ErrorCode != commonpb.ErrorCode_Success {
metrics.QueryNodeSQCount.WithLabelValues(fmt.Sprint(paramtable.GetNodeID()), metrics.SearchLabel, metrics.FailLabel, metrics.Leader).Inc() metrics.QueryNodeSQCount.WithLabelValues(fmt.Sprint(paramtable.GetNodeID()), metrics.QueryLabel, metrics.FailLabel, metrics.Leader).Inc()
} }
}() }()
......
...@@ -906,7 +906,7 @@ func (node *QueryNode) QuerySegments(ctx context.Context, req *querypb.QueryRequ ...@@ -906,7 +906,7 @@ func (node *QueryNode) QuerySegments(ctx context.Context, req *querypb.QueryRequ
metrics.QueryNodeSQCount.WithLabelValues(fmt.Sprint(paramtable.GetNodeID()), metrics.QueryLabel, metrics.TotalLabel, metrics.FromLeader).Inc() metrics.QueryNodeSQCount.WithLabelValues(fmt.Sprint(paramtable.GetNodeID()), metrics.QueryLabel, metrics.TotalLabel, metrics.FromLeader).Inc()
defer func() { defer func() {
if failRet.Status.ErrorCode != commonpb.ErrorCode_Success { if failRet.Status.ErrorCode != commonpb.ErrorCode_Success {
metrics.QueryNodeSQCount.WithLabelValues(fmt.Sprint(paramtable.GetNodeID()), metrics.SearchLabel, metrics.FailLabel, metrics.FromLeader).Inc() metrics.QueryNodeSQCount.WithLabelValues(fmt.Sprint(paramtable.GetNodeID()), metrics.QueryLabel, metrics.FailLabel, metrics.FromLeader).Inc()
} }
}() }()
...@@ -1015,12 +1015,14 @@ func (node *QueryNode) Query(ctx context.Context, req *querypb.QueryRequest) (*i ...@@ -1015,12 +1015,14 @@ func (node *QueryNode) Query(ctx context.Context, req *querypb.QueryRequest) (*i
return WrapRetrieveResult(commonpb.ErrorCode_UnexpectedError, "failed to query channel", err), nil return WrapRetrieveResult(commonpb.ErrorCode_UnexpectedError, "failed to query channel", err), nil
} }
tr := timerecord.NewTimeRecorderWithTrace(ctx, "queryRequestReduce")
reducer := segments.CreateInternalReducer(req, node.manager.Collection.Get(req.GetReq().GetCollectionID()).Schema()) reducer := segments.CreateInternalReducer(req, node.manager.Collection.Get(req.GetReq().GetCollectionID()).Schema())
ret, err := reducer.Reduce(ctx, toMergeResults) ret, err := reducer.Reduce(ctx, toMergeResults)
if err != nil { if err != nil {
return WrapRetrieveResult(commonpb.ErrorCode_UnexpectedError, "failed to query channel", err), nil return WrapRetrieveResult(commonpb.ErrorCode_UnexpectedError, "failed to query channel", err), nil
} }
metrics.QueryNodeReduceLatency.WithLabelValues(fmt.Sprint(paramtable.GetNodeID()), metrics.QueryLabel).
Observe(float64(tr.ElapseSpan().Milliseconds()))
if !req.FromShardLeader { if !req.FromShardLeader {
collector.Rate.Add(metricsinfo.NQPerSecond, 1) collector.Rate.Add(metricsinfo.NQPerSecond, 1)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册