diff --git a/internal/proxy/impl.go b/internal/proxy/impl.go index 3cb10312db..d9912b3eb3 100644 --- a/internal/proxy/impl.go +++ b/internal/proxy/impl.go @@ -234,6 +234,11 @@ func (node *Proxy) DropCollection(ctx context.Context, request *milvuspb.DropCol if !node.checkHealthy() { return unhealthyStatus(), nil } + + sp, ctx := trace.StartSpanFromContextWithOperationName(ctx, "Proxy-DropCollection") + defer sp.Finish() + traceID, _, _ := trace.InfoFromSpan(sp) + dct := &dropCollectionTask{ ctx: ctx, Condition: NewTaskCondition(ctx), @@ -243,42 +248,61 @@ func (node *Proxy) DropCollection(ctx context.Context, request *milvuspb.DropCol chTicker: node.chTicker, } - log.Debug("DropCollection enqueue", + log.Debug("DropCollection received", + zap.String("traceID", traceID), zap.String("role", Params.RoleName), zap.String("db", request.DbName), zap.String("collection", request.CollectionName)) - err := node.sched.ddQueue.Enqueue(dct) - if err != nil { - return &commonpb.Status{ - ErrorCode: commonpb.ErrorCode_UnexpectedError, - Reason: err.Error(), - }, nil - } - log.Debug("DropCollection", - 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)) - defer func() { - log.Debug("DropCollection Done", + if err := node.sched.ddQueue.Enqueue(dct); err != nil { + log.Warn("DropCollection failed to enqueue", 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)) - }() - err = dct.WaitToFinish() - if err != nil { return &commonpb.Status{ ErrorCode: commonpb.ErrorCode_UnexpectedError, Reason: err.Error(), }, nil } + log.Debug("DropCollection enqueued", + zap.String("traceID", traceID), + zap.String("role", Params.RoleName), + zap.Int64("MsgID", dct.ID()), + zap.Uint64("BeginTs", dct.BeginTs()), + zap.Uint64("EndTs", dct.EndTs()), + zap.String("db", request.DbName), + zap.String("collection", request.CollectionName)) + + if err := dct.WaitToFinish(); err != nil { + log.Warn("DropCollection failed to WaitToFinish", + zap.Error(err), + zap.String("traceID", traceID), + zap.String("role", Params.RoleName), + zap.Int64("MsgID", dct.ID()), + zap.Uint64("BeginTs", dct.BeginTs()), + zap.Uint64("EndTs", dct.EndTs()), + zap.String("db", request.DbName), + zap.String("collection", request.CollectionName)) + + return &commonpb.Status{ + ErrorCode: commonpb.ErrorCode_UnexpectedError, + Reason: err.Error(), + }, nil + } + + log.Debug("DropCollection done", + zap.String("traceID", traceID), + zap.String("role", Params.RoleName), + zap.Int64("MsgID", dct.ID()), + zap.Uint64("BeginTs", dct.BeginTs()), + zap.Uint64("EndTs", dct.EndTs()), + zap.String("db", request.DbName), + zap.String("collection", request.CollectionName)) + return dct.result, nil }