Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
milvus
milvus
提交
b6f69fe7
M
milvus
项目概览
milvus
/
milvus
大约 1 年 前同步成功
通知
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,发现更多精彩内容 >>
未验证
提交
b6f69fe7
编写于
4月 03, 2023
作者:
Y
yihao.dai
提交者:
GitHub
4月 03, 2023
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Check if loaded before delegator search/query (#23162)
Signed-off-by:
N
bigsheeper
<
yihao.dai@zilliz.com
>
上级
9cecdc4f
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
78 addition
and
0 deletion
+78
-0
internal/querynodev2/delegator/delegator.go
internal/querynodev2/delegator/delegator.go
+11
-0
internal/querynodev2/delegator/delegator_test.go
internal/querynodev2/delegator/delegator_test.go
+67
-0
未找到文件。
internal/querynodev2/delegator/delegator.go
浏览文件 @
b6f69fe7
...
@@ -37,6 +37,7 @@ import (
...
@@ -37,6 +37,7 @@ import (
"github.com/milvus-io/milvus/internal/querynodev2/segments"
"github.com/milvus-io/milvus/internal/querynodev2/segments"
"github.com/milvus-io/milvus/internal/querynodev2/tsafe"
"github.com/milvus-io/milvus/internal/querynodev2/tsafe"
"github.com/milvus-io/milvus/internal/util/funcutil"
"github.com/milvus-io/milvus/internal/util/funcutil"
"github.com/milvus-io/milvus/internal/util/merr"
"github.com/milvus-io/milvus/internal/util/paramtable"
"github.com/milvus-io/milvus/internal/util/paramtable"
"github.com/milvus-io/milvus/internal/util/tsoutil"
"github.com/milvus-io/milvus/internal/util/tsoutil"
"github.com/samber/lo"
"github.com/samber/lo"
...
@@ -205,6 +206,11 @@ func (sd *shardDelegator) Search(ctx context.Context, req *querypb.SearchRequest
...
@@ -205,6 +206,11 @@ func (sd *shardDelegator) Search(ctx context.Context, req *querypb.SearchRequest
return
nil
,
fmt
.
Errorf
(
"dml channel not match, delegator channel %s, search channels %v"
,
sd
.
vchannelName
,
req
.
GetDmlChannels
())
return
nil
,
fmt
.
Errorf
(
"dml channel not match, delegator channel %s, search channels %v"
,
sd
.
vchannelName
,
req
.
GetDmlChannels
())
}
}
partitions
:=
req
.
GetReq
()
.
GetPartitionIDs
()
if
!
sd
.
collection
.
ExistPartition
(
partitions
...
)
{
return
nil
,
merr
.
WrapErrPartitionNotLoaded
(
partitions
)
}
// wait tsafe
// wait tsafe
err
:=
sd
.
waitTSafe
(
ctx
,
req
.
Req
.
GuaranteeTimestamp
)
err
:=
sd
.
waitTSafe
(
ctx
,
req
.
Req
.
GuaranteeTimestamp
)
if
err
!=
nil
{
if
err
!=
nil
{
...
@@ -251,6 +257,11 @@ func (sd *shardDelegator) Query(ctx context.Context, req *querypb.QueryRequest)
...
@@ -251,6 +257,11 @@ func (sd *shardDelegator) Query(ctx context.Context, req *querypb.QueryRequest)
return
nil
,
fmt
.
Errorf
(
"dml channel not match, delegator channel %s, search channels %v"
,
sd
.
vchannelName
,
req
.
GetDmlChannels
())
return
nil
,
fmt
.
Errorf
(
"dml channel not match, delegator channel %s, search channels %v"
,
sd
.
vchannelName
,
req
.
GetDmlChannels
())
}
}
partitions
:=
req
.
GetReq
()
.
GetPartitionIDs
()
if
!
sd
.
collection
.
ExistPartition
(
partitions
...
)
{
return
nil
,
merr
.
WrapErrPartitionNotLoaded
(
partitions
)
}
// wait tsafe
// wait tsafe
err
:=
sd
.
waitTSafe
(
ctx
,
req
.
Req
.
GuaranteeTimestamp
)
err
:=
sd
.
waitTSafe
(
ctx
,
req
.
Req
.
GuaranteeTimestamp
)
if
err
!=
nil
{
if
err
!=
nil
{
...
...
internal/querynodev2/delegator/delegator_test.go
浏览文件 @
b6f69fe7
...
@@ -33,6 +33,7 @@ import (
...
@@ -33,6 +33,7 @@ import (
"github.com/milvus-io/milvus/internal/querynodev2/segments"
"github.com/milvus-io/milvus/internal/querynodev2/segments"
"github.com/milvus-io/milvus/internal/querynodev2/tsafe"
"github.com/milvus-io/milvus/internal/querynodev2/tsafe"
"github.com/milvus-io/milvus/internal/util/commonpbutil"
"github.com/milvus-io/milvus/internal/util/commonpbutil"
"github.com/milvus-io/milvus/internal/util/merr"
"github.com/milvus-io/milvus/internal/util/paramtable"
"github.com/milvus-io/milvus/internal/util/paramtable"
"github.com/samber/lo"
"github.com/samber/lo"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/assert"
...
@@ -259,6 +260,39 @@ func (s *DelegatorSuite) TestSearch() {
...
@@ -259,6 +260,39 @@ func (s *DelegatorSuite) TestSearch() {
s
.
Equal
(
3
,
len
(
results
))
s
.
Equal
(
3
,
len
(
results
))
})
})
s
.
Run
(
"partition_not_loaded"
,
func
()
{
defer
func
()
{
s
.
workerManager
.
ExpectedCalls
=
nil
}()
workers
:=
make
(
map
[
int64
]
*
cluster
.
MockWorker
)
worker1
:=
&
cluster
.
MockWorker
{}
worker2
:=
&
cluster
.
MockWorker
{}
workers
[
1
]
=
worker1
workers
[
2
]
=
worker2
worker1
.
EXPECT
()
.
Search
(
mock
.
Anything
,
mock
.
AnythingOfType
(
"*querypb.SearchRequest"
))
.
Return
(
&
internalpb
.
SearchResults
{},
nil
)
worker2
.
EXPECT
()
.
Search
(
mock
.
Anything
,
mock
.
AnythingOfType
(
"*querypb.SearchRequest"
))
.
Return
(
&
internalpb
.
SearchResults
{},
nil
)
s
.
workerManager
.
EXPECT
()
.
GetWorker
(
mock
.
AnythingOfType
(
"int64"
))
.
Call
.
Return
(
func
(
nodeID
int64
)
cluster
.
Worker
{
return
workers
[
nodeID
]
},
nil
)
ctx
,
cancel
:=
context
.
WithCancel
(
context
.
Background
())
defer
cancel
()
_
,
err
:=
s
.
delegator
.
Search
(
ctx
,
&
querypb
.
SearchRequest
{
Req
:
&
internalpb
.
SearchRequest
{
Base
:
commonpbutil
.
NewMsgBase
(),
PartitionIDs
:
[]
int64
{
500
},
},
DmlChannels
:
[]
string
{
s
.
vchannelName
},
})
errors
.
Is
(
err
,
merr
.
ErrPartitionNotLoaded
)
})
s
.
Run
(
"worker_return_error"
,
func
()
{
s
.
Run
(
"worker_return_error"
,
func
()
{
defer
func
()
{
defer
func
()
{
s
.
workerManager
.
ExpectedCalls
=
nil
s
.
workerManager
.
ExpectedCalls
=
nil
...
@@ -478,6 +512,39 @@ func (s *DelegatorSuite) TestQuery() {
...
@@ -478,6 +512,39 @@ func (s *DelegatorSuite) TestQuery() {
s
.
Equal
(
3
,
len
(
results
))
s
.
Equal
(
3
,
len
(
results
))
})
})
s
.
Run
(
"partition_not_loaded"
,
func
()
{
defer
func
()
{
s
.
workerManager
.
ExpectedCalls
=
nil
}()
workers
:=
make
(
map
[
int64
]
*
cluster
.
MockWorker
)
worker1
:=
&
cluster
.
MockWorker
{}
worker2
:=
&
cluster
.
MockWorker
{}
workers
[
1
]
=
worker1
workers
[
2
]
=
worker2
worker1
.
EXPECT
()
.
Query
(
mock
.
Anything
,
mock
.
AnythingOfType
(
"*querypb.QueryRequest"
))
.
Return
(
&
internalpb
.
RetrieveResults
{},
nil
)
worker2
.
EXPECT
()
.
Query
(
mock
.
Anything
,
mock
.
AnythingOfType
(
"*querypb.QueryRequest"
))
.
Return
(
&
internalpb
.
RetrieveResults
{},
nil
)
s
.
workerManager
.
EXPECT
()
.
GetWorker
(
mock
.
AnythingOfType
(
"int64"
))
.
Call
.
Return
(
func
(
nodeID
int64
)
cluster
.
Worker
{
return
workers
[
nodeID
]
},
nil
)
ctx
,
cancel
:=
context
.
WithCancel
(
context
.
Background
())
defer
cancel
()
_
,
err
:=
s
.
delegator
.
Query
(
ctx
,
&
querypb
.
QueryRequest
{
Req
:
&
internalpb
.
RetrieveRequest
{
Base
:
commonpbutil
.
NewMsgBase
(),
PartitionIDs
:
[]
int64
{
500
},
},
DmlChannels
:
[]
string
{
s
.
vchannelName
},
})
errors
.
Is
(
err
,
merr
.
ErrPartitionNotLoaded
)
})
s
.
Run
(
"worker_return_error"
,
func
()
{
s
.
Run
(
"worker_return_error"
,
func
()
{
defer
func
()
{
defer
func
()
{
s
.
workerManager
.
ExpectedCalls
=
nil
s
.
workerManager
.
ExpectedCalls
=
nil
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录