未验证 提交 dcb6c3b2 编写于 作者: D dragondriver 提交者: GitHub

Refine log of ReleasePartitions (#12939)

Signed-off-by: Ndragondriver <jiquan.long@zilliz.com>
上级 349e3aa8
...@@ -468,7 +468,7 @@ func (node *Proxy) ReleaseCollection(ctx context.Context, request *milvuspb.Rele ...@@ -468,7 +468,7 @@ func (node *Proxy) ReleaseCollection(ctx context.Context, request *milvuspb.Rele
return unhealthyStatus(), nil return unhealthyStatus(), nil
} }
sp, ctx := trace.StartSpanFromContextWithOperationName(ctx, "Proxy-Insert") sp, ctx := trace.StartSpanFromContextWithOperationName(ctx, "Proxy-ReleaseCollection")
defer sp.Finish() defer sp.Finish()
traceID, _, _ := trace.InfoFromSpan(sp) traceID, _, _ := trace.InfoFromSpan(sp)
...@@ -546,7 +546,7 @@ func (node *Proxy) DescribeCollection(ctx context.Context, request *milvuspb.Des ...@@ -546,7 +546,7 @@ func (node *Proxy) DescribeCollection(ctx context.Context, request *milvuspb.Des
}, nil }, nil
} }
sp, ctx := trace.StartSpanFromContextWithOperationName(ctx, "Proxy-Insert") sp, ctx := trace.StartSpanFromContextWithOperationName(ctx, "Proxy-DescribeCollection")
defer sp.Finish() defer sp.Finish()
traceID, _, _ := trace.InfoFromSpan(sp) traceID, _, _ := trace.InfoFromSpan(sp)
...@@ -790,7 +790,7 @@ func (node *Proxy) CreatePartition(ctx context.Context, request *milvuspb.Create ...@@ -790,7 +790,7 @@ func (node *Proxy) CreatePartition(ctx context.Context, request *milvuspb.Create
return unhealthyStatus(), nil return unhealthyStatus(), nil
} }
sp, ctx := trace.StartSpanFromContextWithOperationName(ctx, "Proxy-Insert") sp, ctx := trace.StartSpanFromContextWithOperationName(ctx, "Proxy-CreatePartition")
defer sp.Finish() defer sp.Finish()
traceID, _, _ := trace.InfoFromSpan(sp) traceID, _, _ := trace.InfoFromSpan(sp)
...@@ -876,7 +876,7 @@ func (node *Proxy) DropPartition(ctx context.Context, request *milvuspb.DropPart ...@@ -876,7 +876,7 @@ func (node *Proxy) DropPartition(ctx context.Context, request *milvuspb.DropPart
return unhealthyStatus(), nil return unhealthyStatus(), nil
} }
sp, ctx := trace.StartSpanFromContextWithOperationName(ctx, "Proxy-Insert") sp, ctx := trace.StartSpanFromContextWithOperationName(ctx, "Proxy-DropPartition")
defer sp.Finish() defer sp.Finish()
traceID, _, _ := trace.InfoFromSpan(sp) traceID, _, _ := trace.InfoFromSpan(sp)
...@@ -1146,6 +1146,11 @@ func (node *Proxy) ReleasePartitions(ctx context.Context, request *milvuspb.Rele ...@@ -1146,6 +1146,11 @@ func (node *Proxy) ReleasePartitions(ctx context.Context, request *milvuspb.Rele
if !node.checkHealthy() { if !node.checkHealthy() {
return unhealthyStatus(), nil return unhealthyStatus(), nil
} }
sp, ctx := trace.StartSpanFromContextWithOperationName(ctx, "Proxy-ReleasePartitions")
defer sp.Finish()
traceID, _, _ := trace.InfoFromSpan(sp)
rpt := &releasePartitionsTask{ rpt := &releasePartitionsTask{
ctx: ctx, ctx: ctx,
Condition: NewTaskCondition(ctx), Condition: NewTaskCondition(ctx),
...@@ -1153,45 +1158,73 @@ func (node *Proxy) ReleasePartitions(ctx context.Context, request *milvuspb.Rele ...@@ -1153,45 +1158,73 @@ func (node *Proxy) ReleasePartitions(ctx context.Context, request *milvuspb.Rele
queryCoord: node.queryCoord, queryCoord: node.queryCoord,
} }
log.Debug("ReleasePartitions enqueue", method := "ReleasePartitions"
log.Debug(
rpcReceived(method),
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),
zap.Any("partitions", request.PartitionNames)) zap.Any("partitions", request.PartitionNames))
err := node.sched.ddQueue.Enqueue(rpt)
if err != nil { if err := node.sched.ddQueue.Enqueue(rpt); err != nil {
log.Warn(
rpcFailedToEnqueue(method),
zap.Error(err),
zap.String("traceID", traceID),
zap.String("role", Params.RoleName),
zap.String("db", request.DbName),
zap.String("collection", request.CollectionName),
zap.Any("partitions", request.PartitionNames))
return &commonpb.Status{ return &commonpb.Status{
ErrorCode: commonpb.ErrorCode_UnexpectedError, ErrorCode: commonpb.ErrorCode_UnexpectedError,
Reason: err.Error(), Reason: err.Error(),
}, nil }, nil
} }
log.Debug("ReleasePartitions", log.Debug(
rpcEnqueued(method),
zap.String("traceID", traceID),
zap.String("role", Params.RoleName), zap.String("role", Params.RoleName),
zap.Int64("msgID", request.Base.MsgID), zap.Int64("msgID", rpt.Base.MsgID),
zap.Uint64("timestamp", request.Base.Timestamp), zap.Uint64("BeginTS", rpt.BeginTs()),
zap.Uint64("EndTS", rpt.EndTs()),
zap.String("db", request.DbName), zap.String("db", request.DbName),
zap.String("collection", request.CollectionName), zap.String("collection", request.CollectionName),
zap.Any("partitions", request.PartitionNames)) zap.Any("partitions", request.PartitionNames))
defer func() {
log.Debug("ReleasePartitions Done", if err := rpt.WaitToFinish(); err != nil {
log.Warn(
rpcFailedToWaitToFinish(method),
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.Int64("msgID", rpt.Base.MsgID),
zap.Uint64("timestamp", request.Base.Timestamp), zap.Uint64("BeginTS", rpt.BeginTs()),
zap.Uint64("EndTS", rpt.EndTs()),
zap.String("db", request.DbName), zap.String("db", request.DbName),
zap.String("collection", request.CollectionName), zap.String("collection", request.CollectionName),
zap.Any("partitions", request.PartitionNames)) zap.Any("partitions", request.PartitionNames))
}()
err = rpt.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(
rpcDone(method),
zap.String("traceID", traceID),
zap.String("role", Params.RoleName),
zap.Int64("msgID", rpt.Base.MsgID),
zap.Uint64("BeginTS", rpt.BeginTs()),
zap.Uint64("EndTS", rpt.EndTs()),
zap.String("db", request.DbName),
zap.String("collection", request.CollectionName),
zap.Any("partitions", request.PartitionNames))
return rpt.result, nil return rpt.result, nil
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册