test/milvus
1
0
Fork 0
mirror of https://gitee.com/milvus-io/milvus.git synced 2024-11-30 10:59:32 +08:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity

enhance: Add trace span for scheduling read tasks in QueryNode (#30265)

Browse Source 
This PR adds a trace span for search/query task scheduling duration

---------

Signed-off-by: Congqi Xia <congqi.xia@zilliz.com>
This commit is contained in:
congqixia 2024-01-25 16:59:00 +08:00 committed by GitHub
parent ea44277961
commit f2c0ead51a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
internal/querynodev2/tasks/query_task.go
View File

@ -6,6 +6,9 @@ import (
"strconv"
"time"
"go.opentelemetry.io/otel"
"go.opentelemetry.io/otel/trace"
"github.com/milvus-io/milvus-proto/go-api/v2/commonpb"
"github.com/milvus-io/milvus/internal/proto/internalpb"
"github.com/milvus-io/milvus/internal/proto/querypb"
@ -16,6 +19,7 @@ import (
"github.com/milvus-io/milvus/pkg/util/metricsinfo"
"github.com/milvus-io/milvus/pkg/util/paramtable"
"github.com/milvus-io/milvus/pkg/util/timerecord"
"github.com/milvus-io/milvus/pkg/util/typeutil"
)
var _ Task = &QueryTask{}
@ -25,6 +29,7 @@ func NewQueryTask(ctx context.Context,
manager *segments.Manager,
req *querypb.QueryRequest,
) *QueryTask {
ctx, span := otel.Tracer(typeutil.QueryNodeRole).Start(ctx, "schedule")
return &QueryTask{
ctx: ctx,
collection: collection,
@ -32,6 +37,7 @@ func NewQueryTask(ctx context.Context,
req: req,
notifier: make(chan error, 1),
tr: timerecord.NewTimeRecorderWithTrace(ctx, "queryTask"),
scheduleSpan: span,
}
}
@ -43,6 +49,7 @@ type QueryTask struct {
result *internalpb.RetrieveResults
notifier chan error
tr *timerecord.TimeRecorder
scheduleSpan trace.Span
}
// Return the username which task is belong to.
@ -81,6 +88,9 @@ func (t *QueryTask) PreExecute() error {
// Execute the task, only call once.
func (t *QueryTask) Execute() error {
if t.scheduleSpan != nil {
t.scheduleSpan.End()
}
tr := timerecord.NewTimeRecorderWithTrace(t.ctx, "QueryTask")
retrievePlan, err := segments.NewRetrievePlan(

11
internal/querynodev2/tasks/task.go
View File

@ -9,6 +9,8 @@ import (
"strconv"
"github.com/golang/protobuf/proto"
"go.opentelemetry.io/otel"
"go.opentelemetry.io/otel/trace"
"go.uber.org/zap"
"github.com/milvus-io/milvus-proto/go-api/v2/commonpb"
@ -23,6 +25,7 @@ import (
"github.com/milvus-io/milvus/pkg/util/metricsinfo"
"github.com/milvus-io/milvus/pkg/util/paramtable"
"github.com/milvus-io/milvus/pkg/util/timerecord"
"github.com/milvus-io/milvus/pkg/util/typeutil"
)
var (
@ -46,7 +49,8 @@ type SearchTask struct {
others []*SearchTask
notifier chan error
tr *timerecord.TimeRecorder
tr *timerecord.TimeRecorder
scheduleSpan trace.Span
}
func NewSearchTask(ctx context.Context,
@ -54,6 +58,7 @@ func NewSearchTask(ctx context.Context,
manager *segments.Manager,
req *querypb.SearchRequest,
) *SearchTask {
ctx, span := otel.Tracer(typeutil.QueryNodeRole).Start(ctx, "schedule")
return &SearchTask{
ctx: ctx,
collection: collection,
@ -68,6 +73,7 @@ func NewSearchTask(ctx context.Context,
originNqs: []int64{req.GetReq().GetNq()},
notifier: make(chan error, 1),
tr: timerecord.NewTimeRecorderWithTrace(ctx, "searchTask"),
scheduleSpan: span,
}
}
@ -118,6 +124,9 @@ func (t *SearchTask) Execute() error {
zap.String("shard", t.req.GetDmlChannels()[0]),
)
if t.scheduleSpan != nil {
t.scheduleSpan.End()
}
tr := timerecord.NewTimeRecorderWithTrace(t.ctx, "SearchTask")
req := t.req