Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
milvus
milvus
提交
a38c84e7
M
milvus
项目概览
milvus
/
milvus
11 个月 前同步成功
通知
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,发现更多精彩内容 >>
未验证
提交
a38c84e7
编写于
4月 29, 2022
作者:
L
Letian Jiang
提交者:
GitHub
4月 29, 2022
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Lock meta-replica during search/query (#16703)
Signed-off-by:
N
Letian Jiang
<
letian.jiang@zilliz.com
>
上级
515d0369
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
21 addition
and
8 deletion
+21
-8
internal/querynode/query_shard.go
internal/querynode/query_shard.go
+21
-8
未找到文件。
internal/querynode/query_shard.go
浏览文件 @
a38c84e7
...
...
@@ -292,6 +292,16 @@ func (q *queryShard) search(ctx context.Context, req *querypb.SearchRequest) (*i
return
nil
,
errors
.
New
(
"search context timeout"
)
}
// lock historic meta-replica
q
.
historical
.
replica
.
queryRLock
()
defer
q
.
historical
.
replica
.
queryRUnlock
()
// lock streaming meta-replica for shard leader
if
len
(
req
.
SegmentIDs
)
==
0
{
q
.
streaming
.
replica
.
queryRLock
()
defer
q
.
streaming
.
replica
.
queryRUnlock
()
}
// check if collection has been released
collection
,
err
:=
q
.
historical
.
replica
.
getCollectionByID
(
collectionID
)
if
err
!=
nil
{
...
...
@@ -350,8 +360,6 @@ func (q *queryShard) search(ctx context.Context, req *querypb.SearchRequest) (*i
func
(
q
*
queryShard
)
searchLeader
(
ctx
context
.
Context
,
req
*
querypb
.
SearchRequest
,
searchRequests
[]
*
searchRequest
,
collectionID
UniqueID
,
partitionIDs
[]
UniqueID
,
schemaHelper
*
typeutil
.
SchemaHelper
,
plan
*
SearchPlan
,
topK
int64
,
queryNum
int64
,
timestamp
Timestamp
)
(
*
internalpb
.
SearchResults
,
error
)
{
q
.
streaming
.
replica
.
queryRLock
()
defer
q
.
streaming
.
replica
.
queryRUnlock
()
cluster
,
ok
:=
q
.
clusterService
.
getShardCluster
(
req
.
GetDmlChannel
())
if
!
ok
{
return
nil
,
fmt
.
Errorf
(
"channel %s leader is not here"
,
req
.
GetDmlChannel
())
...
...
@@ -493,8 +501,6 @@ func (q *queryShard) searchLeader(ctx context.Context, req *querypb.SearchReques
func
(
q
*
queryShard
)
searchFollower
(
ctx
context
.
Context
,
req
*
querypb
.
SearchRequest
,
searchRequests
[]
*
searchRequest
,
collectionID
UniqueID
,
partitionIDs
[]
UniqueID
,
schemaHelper
*
typeutil
.
SchemaHelper
,
plan
*
SearchPlan
,
topK
int64
,
queryNum
int64
,
timestamp
Timestamp
)
(
*
internalpb
.
SearchResults
,
error
)
{
q
.
historical
.
replica
.
queryRLock
()
defer
q
.
historical
.
replica
.
queryRUnlock
()
segmentIDs
:=
req
.
GetSegmentIDs
()
// hold request until guarantee timestamp >= service timestamp
guaranteeTs
:=
req
.
GetReq
()
.
GetGuaranteeTimestamp
()
...
...
@@ -700,6 +706,16 @@ func (q *queryShard) query(ctx context.Context, req *querypb.QueryRequest) (*int
return
nil
,
errors
.
New
(
"search context timeout"
)
}
// lock historic meta-replica
q
.
historical
.
replica
.
queryRLock
()
defer
q
.
historical
.
replica
.
queryRUnlock
()
// lock streaming meta-replica for shard leader
if
len
(
req
.
SegmentIDs
)
==
0
{
q
.
streaming
.
replica
.
queryRLock
()
defer
q
.
streaming
.
replica
.
queryRUnlock
()
}
// check if collection has been released
collection
,
err
:=
q
.
streaming
.
replica
.
getCollectionByID
(
collectionID
)
if
err
!=
nil
{
...
...
@@ -737,8 +753,6 @@ func (q *queryShard) query(ctx context.Context, req *querypb.QueryRequest) (*int
// check if shard leader b.c only leader receives request with no segment specified
if
len
(
req
.
GetSegmentIDs
())
==
0
{
q
.
streaming
.
replica
.
queryRLock
()
defer
q
.
streaming
.
replica
.
queryRUnlock
()
cluster
,
ok
:=
q
.
clusterService
.
getShardCluster
(
req
.
GetDmlChannel
())
if
!
ok
{
return
nil
,
fmt
.
Errorf
(
"channel %s leader is not here"
,
req
.
GetDmlChannel
())
...
...
@@ -814,8 +828,7 @@ func (q *queryShard) query(ctx context.Context, req *querypb.QueryRequest) (*int
log
.
Debug
(
"leader retrieve result"
,
zap
.
String
(
"channel"
,
req
.
DmlChannel
),
zap
.
String
(
"ids"
,
mergedResults
.
Ids
.
String
()))
return
mergedResults
,
nil
}
q
.
historical
.
replica
.
queryRLock
()
defer
q
.
historical
.
replica
.
queryRUnlock
()
// hold request until guarantee timestamp >= service timestamp
guaranteeTs
:=
req
.
GetReq
()
.
GetGuaranteeTimestamp
()
q
.
waitUntilServiceable
(
ctx
,
guaranteeTs
,
tsTypeDelta
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录