Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
milvus
milvus
提交
6cd34278
M
milvus
项目概览
milvus
/
milvus
12 个月 前同步成功
通知
261
Star
22476
Fork
2472
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
M
milvus
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
6cd34278
编写于
11月 29, 2021
作者:
D
dragondriver
提交者:
GitHub
11月 29, 2021
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Refine the log of Search (#12333)
Signed-off-by:
N
dragondriver
<
jiquan.long@zilliz.com
>
上级
772857d9
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
39 addition
and
21 deletion
+39
-21
internal/proxy/impl.go
internal/proxy/impl.go
+39
-21
未找到文件。
internal/proxy/impl.go
浏览文件 @
6cd34278
...
...
@@ -1510,8 +1510,11 @@ func (node *Proxy) Search(ctx context.Context, request *milvuspb.SearchRequest)
Status
:
unhealthyStatus
(),
},
nil
}
sp
,
ctx
:=
trace
.
StartSpanFromContextWithOperationName
(
ctx
,
"Proxy-Search"
)
defer
sp
.
Finish
()
traceID
,
_
,
_
:=
trace
.
InfoFromSpan
(
sp
)
qt
:=
&
searchTask
{
ctx
:
ctx
,
Condition
:
NewTaskCondition
(
ctx
),
...
...
@@ -1528,7 +1531,8 @@ func (node *Proxy) Search(ctx context.Context, request *milvuspb.SearchRequest)
qc
:
node
.
queryCoord
,
}
log
.
Debug
(
"Search enqueue"
,
log
.
Debug
(
"Search received"
,
zap
.
String
(
"traceID"
,
traceID
),
zap
.
String
(
"role"
,
Params
.
RoleName
),
zap
.
String
(
"db"
,
request
.
DbName
),
zap
.
String
(
"collection"
,
request
.
CollectionName
),
...
...
@@ -1536,8 +1540,21 @@ func (node *Proxy) Search(ctx context.Context, request *milvuspb.SearchRequest)
zap
.
Any
(
"dsl"
,
request
.
Dsl
),
zap
.
Any
(
"len(PlaceholderGroup)"
,
len
(
request
.
PlaceholderGroup
)),
zap
.
Any
(
"OutputFields"
,
request
.
OutputFields
))
err
:=
node
.
sched
.
dqQueue
.
Enqueue
(
qt
)
if
err
!=
nil
{
log
.
Debug
(
"Search failed to enqueue"
,
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
),
zap
.
Any
(
"dsl"
,
request
.
Dsl
),
zap
.
Any
(
"len(PlaceholderGroup)"
,
len
(
request
.
PlaceholderGroup
)),
zap
.
Any
(
"OutputFields"
,
request
.
OutputFields
),
)
return
&
milvuspb
.
SearchResults
{
Status
:
&
commonpb
.
Status
{
ErrorCode
:
commonpb
.
ErrorCode_UnexpectedError
,
...
...
@@ -1546,9 +1563,10 @@ func (node *Proxy) Search(ctx context.Context, request *milvuspb.SearchRequest)
},
nil
}
log
.
Debug
(
"Search"
,
log
.
Debug
(
"Search enqueued"
,
zap
.
String
(
"traceID"
,
traceID
),
zap
.
String
(
"role"
,
Params
.
RoleName
),
zap
.
Int64
(
"msgID"
,
qt
.
Base
.
MsgID
),
zap
.
Int64
(
"msgID"
,
qt
.
ID
()
),
zap
.
Uint64
(
"timestamp"
,
qt
.
Base
.
Timestamp
),
zap
.
String
(
"db"
,
request
.
DbName
),
zap
.
String
(
"collection"
,
request
.
CollectionName
),
...
...
@@ -1556,33 +1574,22 @@ func (node *Proxy) Search(ctx context.Context, request *milvuspb.SearchRequest)
zap
.
Any
(
"dsl"
,
request
.
Dsl
),
zap
.
Any
(
"len(PlaceholderGroup)"
,
len
(
request
.
PlaceholderGroup
)),
zap
.
Any
(
"OutputFields"
,
request
.
OutputFields
))
defer
func
()
{
log
.
Debug
(
"Search Done"
,
err
=
qt
.
WaitToFinish
()
if
err
!=
nil
{
log
.
Debug
(
"Search failed to WaitToFinish"
,
zap
.
Error
(
err
),
zap
.
String
(
"traceID"
,
traceID
),
zap
.
String
(
"role"
,
Params
.
RoleName
),
zap
.
Int64
(
"msgID"
,
qt
.
Base
.
MsgID
),
zap
.
Uint64
(
"timestamp"
,
qt
.
Base
.
Timestamp
),
zap
.
Int64
(
"msgID"
,
qt
.
ID
()),
zap
.
String
(
"db"
,
request
.
DbName
),
zap
.
String
(
"collection"
,
request
.
CollectionName
),
zap
.
Any
(
"partitions"
,
request
.
PartitionNames
),
zap
.
Any
(
"dsl"
,
request
.
Dsl
),
zap
.
Any
(
"len(PlaceholderGroup)"
,
len
(
request
.
PlaceholderGroup
)),
zap
.
Any
(
"OutputFields"
,
request
.
OutputFields
))
}()
err
=
qt
.
WaitToFinish
()
log
.
Debug
(
"Search Finished"
,
zap
.
Error
(
err
),
zap
.
String
(
"role"
,
Params
.
RoleName
),
zap
.
Int64
(
"msgID"
,
qt
.
Base
.
MsgID
),
zap
.
Uint64
(
"timestamp"
,
qt
.
Base
.
Timestamp
),
zap
.
String
(
"db"
,
request
.
DbName
),
zap
.
String
(
"collection"
,
request
.
CollectionName
),
zap
.
Any
(
"partitions"
,
request
.
PartitionNames
),
zap
.
Any
(
"dsl"
,
request
.
Dsl
),
zap
.
Any
(
"len(PlaceholderGroup)"
,
len
(
request
.
PlaceholderGroup
)))
if
err
!=
nil
{
return
&
milvuspb
.
SearchResults
{
Status
:
&
commonpb
.
Status
{
ErrorCode
:
commonpb
.
ErrorCode_UnexpectedError
,
...
...
@@ -1591,6 +1598,17 @@ func (node *Proxy) Search(ctx context.Context, request *milvuspb.SearchRequest)
},
nil
}
log
.
Debug
(
"Search Done"
,
zap
.
String
(
"traceID"
,
traceID
),
zap
.
String
(
"role"
,
Params
.
RoleName
),
zap
.
Int64
(
"msgID"
,
qt
.
ID
()),
zap
.
String
(
"db"
,
request
.
DbName
),
zap
.
String
(
"collection"
,
request
.
CollectionName
),
zap
.
Any
(
"partitions"
,
request
.
PartitionNames
),
zap
.
Any
(
"dsl"
,
request
.
Dsl
),
zap
.
Any
(
"len(PlaceholderGroup)"
,
len
(
request
.
PlaceholderGroup
)),
zap
.
Any
(
"OutputFields"
,
request
.
OutputFields
))
return
qt
.
result
,
nil
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录