Refine log of ReleaseCollection (#12618)

Signed-off-by: dragondriver <jiquan.long@zilliz.com>
This commit is contained in:
dragondriver 2021-12-07 21:03:03 +08:00 committed by GitHub
parent 304cb232d2
commit a2ee829833
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -467,6 +467,11 @@ func (node *Proxy) ReleaseCollection(ctx context.Context, request *milvuspb.Rele
if !node.checkHealthy() { if !node.checkHealthy() {
return unhealthyStatus(), nil return unhealthyStatus(), nil
} }
sp, ctx := trace.StartSpanFromContextWithOperationName(ctx, "Proxy-Insert")
defer sp.Finish()
traceID, _, _ := trace.InfoFromSpan(sp)
rct := &releaseCollectionTask{ rct := &releaseCollectionTask{
ctx: ctx, ctx: ctx,
Condition: NewTaskCondition(ctx), Condition: NewTaskCondition(ctx),
@ -475,42 +480,61 @@ func (node *Proxy) ReleaseCollection(ctx context.Context, request *milvuspb.Rele
chMgr: node.chMgr, chMgr: node.chMgr,
} }
log.Debug("ReleaseCollection enqueue", log.Debug("ReleaseCollection received",
zap.String("traceID", traceID),
zap.String("role", Params.RoleName), zap.String("role", Params.RoleName),
zap.String("db", request.DbName), zap.String("db", request.DbName),
zap.String("collection", request.CollectionName)) zap.String("collection", request.CollectionName))
err := node.sched.ddQueue.Enqueue(rct)
if err != nil {
return &commonpb.Status{
ErrorCode: commonpb.ErrorCode_UnexpectedError,
Reason: err.Error(),
}, nil
}
log.Debug("ReleaseCollection", if err := node.sched.ddQueue.Enqueue(rct); err != nil {
zap.String("role", Params.RoleName), log.Debug("ReleaseCollection failed to enqueue",
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("ReleaseCollection Done",
zap.Error(err), zap.Error(err),
zap.String("traceID", traceID),
zap.String("role", Params.RoleName), zap.String("role", Params.RoleName),
zap.Int64("msgID", request.Base.MsgID),
zap.Uint64("timestamp", request.Base.Timestamp),
zap.String("db", request.DbName), zap.String("db", request.DbName),
zap.String("collection", request.CollectionName)) zap.String("collection", request.CollectionName))
}()
err = rct.WaitToFinish()
if err != nil {
return &commonpb.Status{ return &commonpb.Status{
ErrorCode: commonpb.ErrorCode_UnexpectedError, ErrorCode: commonpb.ErrorCode_UnexpectedError,
Reason: err.Error(), Reason: err.Error(),
}, nil }, nil
} }
log.Debug("ReleaseCollection enqueued",
zap.String("traceID", traceID),
zap.String("role", Params.RoleName),
zap.Int64("MsgID", rct.ID()),
zap.Uint64("BeginTS", rct.BeginTs()),
zap.Uint64("EndTS", rct.EndTs()),
zap.String("db", request.DbName),
zap.String("collection", request.CollectionName))
if err := rct.WaitToFinish(); err != nil {
log.Debug("ReleaseCollection failed to WaitToFinish",
zap.Error(err),
zap.String("traceID", traceID),
zap.String("role", Params.RoleName),
zap.Int64("MsgID", rct.ID()),
zap.Uint64("BeginTS", rct.BeginTs()),
zap.Uint64("EndTS", rct.EndTs()),
zap.String("db", request.DbName),
zap.String("collection", request.CollectionName))
return &commonpb.Status{
ErrorCode: commonpb.ErrorCode_UnexpectedError,
Reason: err.Error(),
}, nil
}
log.Debug("ReleaseCollection done",
zap.String("traceID", traceID),
zap.String("role", Params.RoleName),
zap.Int64("MsgID", rct.ID()),
zap.Uint64("BeginTS", rct.BeginTs()),
zap.Uint64("EndTS", rct.EndTs()),
zap.String("db", request.DbName),
zap.String("collection", request.CollectionName))
return rct.result, nil return rct.result, nil
} }