diff --git a/internal/proxy/impl.go b/internal/proxy/impl.go index d5968ade33..3a15b6bc01 100644 --- a/internal/proxy/impl.go +++ b/internal/proxy/impl.go @@ -966,7 +966,7 @@ func (node *Proxy) HasPartition(ctx context.Context, request *milvuspb.HasPartit }, nil } - sp, ctx := trace.StartSpanFromContextWithOperationName(ctx, "Proxy-Insert") + sp, ctx := trace.StartSpanFromContextWithOperationName(ctx, "Proxy-HasPartition") defer sp.Finish() traceID, _, _ := trace.InfoFromSpan(sp) @@ -1060,7 +1060,7 @@ func (node *Proxy) LoadPartitions(ctx context.Context, request *milvuspb.LoadPar return unhealthyStatus(), nil } - sp, ctx := trace.StartSpanFromContextWithOperationName(ctx, "Proxy-Insert") + sp, ctx := trace.StartSpanFromContextWithOperationName(ctx, "Proxy-LoadPartitions") defer sp.Finish() traceID, _, _ := trace.InfoFromSpan(sp) @@ -1417,6 +1417,11 @@ func (node *Proxy) CreateIndex(ctx context.Context, request *milvuspb.CreateInde if !node.checkHealthy() { return unhealthyStatus(), nil } + + sp, ctx := trace.StartSpanFromContextWithOperationName(ctx, "Proxy-ShowPartitions") + defer sp.Finish() + traceID, _, _ := trace.InfoFromSpan(sp) + cit := &createIndexTask{ ctx: ctx, Condition: NewTaskCondition(ctx), @@ -1424,48 +1429,78 @@ func (node *Proxy) CreateIndex(ctx context.Context, request *milvuspb.CreateInde rootCoord: node.rootCoord, } - log.Debug("CreateIndex enqueue", - zap.String("role", Params.RoleName), - zap.String("db", request.DbName), - zap.String("collection", request.CollectionName), - zap.String("field", request.FieldName), - zap.Any("extra_params", request.ExtraParams)) - err := node.sched.ddQueue.Enqueue(cit) - if err != nil { - return &commonpb.Status{ - ErrorCode: commonpb.ErrorCode_UnexpectedError, - Reason: err.Error(), - }, nil - } + method := "CreateIndex" - log.Debug("CreateIndex", + log.Debug( + rpcReceived(method), + zap.String("traceID", traceID), zap.String("role", Params.RoleName), - zap.Int64("msgID", request.Base.MsgID), - zap.Uint64("timestamp", request.Base.Timestamp), zap.String("db", request.DbName), zap.String("collection", request.CollectionName), zap.String("field", request.FieldName), zap.Any("extra_params", request.ExtraParams)) - defer func() { - log.Debug("CreateIndex Done", + + if err := node.sched.ddQueue.Enqueue(cit); err != nil { + log.Warn( + rpcFailedToEnqueue(method), zap.Error(err), + zap.String("traceID", traceID), zap.String("role", Params.RoleName), - zap.Int64("msgID", request.Base.MsgID), - zap.Uint64("timestamp", request.Base.Timestamp), zap.String("db", request.DbName), zap.String("collection", request.CollectionName), zap.String("field", request.FieldName), zap.Any("extra_params", request.ExtraParams)) - }() - err = cit.WaitToFinish() - if err != nil { return &commonpb.Status{ ErrorCode: commonpb.ErrorCode_UnexpectedError, Reason: err.Error(), }, nil } + log.Debug( + rpcEnqueued(method), + zap.String("traceID", traceID), + zap.String("role", Params.RoleName), + zap.Int64("MsgID", cit.ID()), + zap.Uint64("BeginTs", cit.BeginTs()), + zap.Uint64("EndTs", cit.EndTs()), + zap.String("db", request.DbName), + zap.String("collection", request.CollectionName), + zap.String("field", request.FieldName), + zap.Any("extra_params", request.ExtraParams)) + + if err := cit.WaitToFinish(); err != nil { + log.Warn( + rpcFailedToWaitToFinish(method), + zap.Error(err), + zap.String("traceID", traceID), + zap.String("role", Params.RoleName), + zap.Int64("MsgID", cit.ID()), + zap.Uint64("BeginTs", cit.BeginTs()), + zap.Uint64("EndTs", cit.EndTs()), + zap.String("db", request.DbName), + zap.String("collection", request.CollectionName), + zap.String("field", request.FieldName), + zap.Any("extra_params", request.ExtraParams)) + + return &commonpb.Status{ + ErrorCode: commonpb.ErrorCode_UnexpectedError, + Reason: err.Error(), + }, nil + } + + log.Debug( + rpcDone(method), + zap.String("traceID", traceID), + zap.String("role", Params.RoleName), + zap.Int64("MsgID", cit.ID()), + zap.Uint64("BeginTs", cit.BeginTs()), + zap.Uint64("EndTs", cit.EndTs()), + zap.String("db", request.DbName), + zap.String("collection", request.CollectionName), + zap.String("field", request.FieldName), + zap.Any("extra_params", request.ExtraParams)) + return cit.result, nil }