enhance: Print nq (#28507)

Log nq in search path.

---------

Signed-off-by: bigsheeper <yihao.dai@zilliz.com>
pull/28569/head
yihao.dai 2023-11-30 10:42:27 +08:00 committed by GitHub
parent 2cd8daaf0b
commit 4b8bc2798e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 4 deletions

View File

@ -2564,7 +2564,7 @@ func (node *Proxy) Search(ctx context.Context, request *milvuspb.SearchRequest)
defer func() {
span := tr.ElapseSpan()
if span >= SlowReadSpan {
log.Info(rpcSlow(method), zap.Duration("duration", span))
log.Info(rpcSlow(method), zap.Int64("nq", qt.SearchRequest.GetNq()), zap.Duration("duration", span))
}
}()
@ -2596,6 +2596,7 @@ func (node *Proxy) Search(ctx context.Context, request *milvuspb.SearchRequest)
if err := qt.WaitToFinish(); err != nil {
log.Warn(
rpcFailedToWaitToFinish(method),
zap.Int64("nq", qt.SearchRequest.GetNq()),
zap.Error(err),
)

View File

@ -210,7 +210,6 @@ func (t *searchTask) PreExecute(ctx context.Context) error {
t.Base.MsgType = commonpb.MsgType_Search
t.Base.SourceID = paramtable.GetNodeID()
log := log.Ctx(ctx)
collectionName := t.request.CollectionName
t.collectionName = collectionName
@ -219,6 +218,8 @@ func (t *searchTask) PreExecute(ctx context.Context) error {
return err
}
log := log.Ctx(ctx).With(zap.Int64("collID", collID), zap.String("collName", collectionName))
t.SearchRequest.DbID = 0 // todo
t.SearchRequest.CollectionID = collID
t.schema, err = globalMetaCache.GetCollectionSchema(ctx, t.request.GetDbName(), collectionName)
@ -270,6 +271,7 @@ func (t *searchTask) PreExecute(ctx context.Context) error {
return fmt.Errorf("%s [%d] is invalid, %w", NQKey, nq, err)
}
t.SearchRequest.Nq = nq
log = log.With(zap.Int64("nq", nq))
outputFieldIDs, err := getOutputFieldIDs(t.schema, t.request.GetOutputFields())
if err != nil {
@ -404,7 +406,7 @@ func (t *searchTask) PreExecute(ctx context.Context) error {
func (t *searchTask) Execute(ctx context.Context) error {
ctx, sp := otel.Tracer(typeutil.ProxyRole).Start(ctx, "Proxy-Search-Execute")
defer sp.End()
log := log.Ctx(ctx)
log := log.Ctx(ctx).With(zap.Int64("nq", t.SearchRequest.GetNq()))
tr := timerecord.NewTimeRecorder(fmt.Sprintf("proxy execute search %d", t.ID()))
defer tr.CtxElapse(ctx, "done")
@ -437,7 +439,7 @@ func (t *searchTask) PostExecute(ctx context.Context) error {
defer func() {
tr.CtxElapse(ctx, "done")
}()
log := log.Ctx(ctx)
log := log.Ctx(ctx).With(zap.Int64("nq", t.SearchRequest.GetNq()))
var (
Nq = t.SearchRequest.GetNq()

View File

@ -335,6 +335,7 @@ func (node *QueryNode) searchChannel(ctx context.Context, req *querypb.SearchReq
zap.Int64("collectionID", req.Req.GetCollectionID()),
zap.String("channel", channel),
zap.String("scope", req.GetScope().String()),
zap.Int64("nq", req.GetReq().GetNq()),
)
traceID := trace.SpanFromContext(ctx).SpanContext().TraceID()

View File

@ -749,6 +749,7 @@ func (node *QueryNode) Search(ctx context.Context, req *querypb.SearchRequest) (
zap.Int64("collectionID", req.GetReq().GetCollectionID()),
zap.Strings("channels", req.GetDmlChannels()),
zap.Bool("fromShardLeader", req.GetFromShardLeader()),
zap.Int64("nq", req.GetReq().GetNq()),
)
log.Debug("Received SearchRequest",