Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
milvus
milvus
提交
9deb245d
M
milvus
项目概览
milvus
/
milvus
10 个月 前同步成功
通知
260
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,体验更适合开发者的 AI 搜索 >>
未验证
提交
9deb245d
编写于
3月 24, 2022
作者:
Y
yah01
提交者:
GitHub
3月 24, 2022
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix data race in unittest (#16165)
Signed-off-by:
N
yah01
<
yang.cen@zilliz.com
>
上级
7fee4743
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
29 addition
and
15 deletion
+29
-15
internal/querycoord/mock_querynode_server_test.go
internal/querycoord/mock_querynode_server_test.go
+20
-8
internal/querycoord/task_scheduler_test.go
internal/querycoord/task_scheduler_test.go
+2
-0
internal/querycoord/task_test.go
internal/querycoord/task_test.go
+7
-7
未找到文件。
internal/querycoord/mock_querynode_server_test.go
浏览文件 @
9deb245d
...
...
@@ -48,6 +48,8 @@ var (
globalSegInfosMutex
sync
.
RWMutex
)
type
rpcHandler
func
()
(
*
commonpb
.
Status
,
error
)
type
queryNodeServerMock
struct
{
querypb
.
QueryNodeServer
ctx
context
.
Context
...
...
@@ -60,14 +62,15 @@ type queryNodeServerMock struct {
queryNodePort
int64
queryNodeID
int64
addQueryChannels
func
()
(
*
commonpb
.
Status
,
error
)
removeQueryChannels
func
()
(
*
commonpb
.
Status
,
error
)
watchDmChannels
func
()
(
*
commonpb
.
Status
,
error
)
watchDeltaChannels
func
()
(
*
commonpb
.
Status
,
error
)
loadSegment
func
()
(
*
commonpb
.
Status
,
error
)
releaseCollection
func
()
(
*
commonpb
.
Status
,
error
)
releasePartition
func
()
(
*
commonpb
.
Status
,
error
)
releaseSegments
func
()
(
*
commonpb
.
Status
,
error
)
rwmutex
sync
.
RWMutex
// guard for all modification
addQueryChannels
rpcHandler
removeQueryChannels
rpcHandler
watchDmChannels
rpcHandler
watchDeltaChannels
rpcHandler
loadSegment
rpcHandler
releaseCollection
rpcHandler
releasePartition
rpcHandler
releaseSegments
rpcHandler
getSegmentInfos
func
()
(
*
querypb
.
GetSegmentInfoResponse
,
error
)
getMetrics
func
()
(
*
milvuspb
.
GetMetricsResponse
,
error
)
...
...
@@ -83,6 +86,7 @@ func newQueryNodeServerMock(ctx context.Context) *queryNodeServerMock {
cancel
:
cancel
,
grpcErrChan
:
make
(
chan
error
),
rwmutex
:
sync
.
RWMutex
{},
addQueryChannels
:
returnSuccessResult
,
removeQueryChannels
:
returnSuccessResult
,
watchDmChannels
:
returnSuccessResult
,
...
...
@@ -100,6 +104,12 @@ func newQueryNodeServerMock(ctx context.Context) *queryNodeServerMock {
}
}
func
(
qs
*
queryNodeServerMock
)
setRPCInterface
(
interfacePointer
*
rpcHandler
,
newhandler
rpcHandler
)
{
qs
.
rwmutex
.
Lock
()
defer
qs
.
rwmutex
.
Unlock
()
*
interfacePointer
=
newhandler
}
func
(
qs
*
queryNodeServerMock
)
Register
()
error
{
log
.
Debug
(
"query node session info"
,
zap
.
String
(
"metaPath"
,
Params
.
EtcdCfg
.
MetaRootPath
))
etcdCli
,
err
:=
etcd
.
GetEtcdClient
(
&
Params
.
EtcdCfg
)
...
...
@@ -231,6 +241,8 @@ func (qs *queryNodeServerMock) LoadSegments(ctx context.Context, req *querypb.Lo
}
func
(
qs
*
queryNodeServerMock
)
ReleaseCollection
(
ctx
context
.
Context
,
req
*
querypb
.
ReleaseCollectionRequest
)
(
*
commonpb
.
Status
,
error
)
{
qs
.
rwmutex
.
RLock
()
defer
qs
.
rwmutex
.
RUnlock
()
return
qs
.
releaseCollection
()
}
...
...
internal/querycoord/task_scheduler_test.go
浏览文件 @
9deb245d
...
...
@@ -515,6 +515,7 @@ func Test_saveInternalTaskToEtcd(t *testing.T) {
ctx
:=
context
.
Background
()
queryCoord
,
err
:=
startQueryCoord
(
ctx
)
assert
.
Nil
(
t
,
err
)
defer
queryCoord
.
Stop
()
testTask
:=
&
testTask
{
baseTask
:
baseTask
{
...
...
@@ -577,6 +578,7 @@ func Test_generateDerivedInternalTasks(t *testing.T) {
}
}
queryCoord
.
Stop
()
err
=
removeAllSession
()
assert
.
Nil
(
t
,
err
)
}
internal/querycoord/task_test.go
浏览文件 @
9deb245d
...
...
@@ -520,20 +520,16 @@ func Test_ReleaseCollectionExecuteFail(t *testing.T) {
node
,
err
:=
startQueryNodeServer
(
ctx
)
assert
.
Nil
(
t
,
err
)
node
.
releaseCollection
=
returnFailedResult
node
.
setRPCInterface
(
&
node
.
releaseCollection
,
returnFailedResult
)
waitQueryNodeOnline
(
queryCoord
.
cluster
,
node
.
queryNodeID
)
releaseCollectionTask
:=
genReleaseCollectionTask
(
ctx
,
queryCoord
)
err
=
queryCoord
.
scheduler
.
Enqueue
(
releaseCollectionTask
)
assert
.
Nil
(
t
,
err
)
for
{
if
releaseCollectionTask
.
getState
()
==
taskDone
{
break
}
}
node
.
releaseCollection
=
returnSuccessResult
waitTaskFinalState
(
releaseCollectionTask
,
taskDone
)
node
.
setRPCInterface
(
&
node
.
releaseCollection
,
returnSuccessResult
)
waitTaskFinalState
(
releaseCollectionTask
,
taskExpired
)
node
.
stop
()
...
...
@@ -1107,10 +1103,12 @@ func TestLoadBalanceAndRescheduleDmChannelTaskAfterNodeDown(t *testing.T) {
ctx
:=
context
.
Background
()
queryCoord
,
err
:=
startQueryCoord
(
ctx
)
assert
.
Nil
(
t
,
err
)
defer
queryCoord
.
Stop
()
node1
,
err
:=
startQueryNodeServer
(
ctx
)
assert
.
Nil
(
t
,
err
)
waitQueryNodeOnline
(
queryCoord
.
cluster
,
node1
.
queryNodeID
)
defer
node1
.
stop
()
loadCollectionTask
:=
genLoadCollectionTask
(
ctx
,
queryCoord
)
...
...
@@ -1120,6 +1118,7 @@ func TestLoadBalanceAndRescheduleDmChannelTaskAfterNodeDown(t *testing.T) {
node2
,
err
:=
startQueryNodeServer
(
ctx
)
assert
.
Nil
(
t
,
err
)
defer
node2
.
stop
()
node2
.
watchDmChannels
=
returnFailedResult
waitQueryNodeOnline
(
queryCoord
.
cluster
,
node2
.
queryNodeID
)
...
...
@@ -1134,6 +1133,7 @@ func TestLoadBalanceAndRescheduleDmChannelTaskAfterNodeDown(t *testing.T) {
node3
,
err
:=
startQueryNodeServer
(
ctx
)
assert
.
Nil
(
t
,
err
)
defer
node3
.
stop
()
waitQueryNodeOnline
(
queryCoord
.
cluster
,
node3
.
queryNodeID
)
dmChannelInfos
:=
queryCoord
.
meta
.
getDmChannelInfosByNodeID
(
node3
.
queryNodeID
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录