Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
milvus
milvus
提交
ae0f467c
M
milvus
项目概览
milvus
/
milvus
9 个月 前同步成功
通知
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 搜索 >>
未验证
提交
ae0f467c
编写于
3月 27, 2023
作者:
Y
yah01
提交者:
GitHub
3月 27, 2023
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix segment/channel may be re-loaded/subscribed (#22969)
Signed-off-by:
N
yah01
<
yang.cen@zilliz.com
>
上级
ef57ba3b
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
54 addition
and
10 deletion
+54
-10
internal/querycoordv2/task/scheduler.go
internal/querycoordv2/task/scheduler.go
+18
-0
internal/querycoordv2/task/task_test.go
internal/querycoordv2/task/task_test.go
+36
-10
未找到文件。
internal/querycoordv2/task/scheduler.go
浏览文件 @
ae0f467c
...
...
@@ -29,6 +29,7 @@ import (
"github.com/milvus-io/milvus/internal/proto/querypb"
"github.com/milvus-io/milvus/internal/querycoordv2/meta"
"github.com/milvus-io/milvus/internal/querycoordv2/session"
"github.com/milvus-io/milvus/internal/querycoordv2/utils"
"github.com/milvus-io/milvus/internal/util/funcutil"
"github.com/milvus-io/milvus/internal/util/merr"
.
"github.com/milvus-io/milvus/internal/util/typeutil"
...
...
@@ -222,6 +223,7 @@ func (scheduler *taskScheduler) Add(task Task) error {
err
:=
scheduler
.
preAdd
(
task
)
if
err
!=
nil
{
task
.
Cancel
(
err
)
return
err
}
...
...
@@ -265,6 +267,14 @@ func (scheduler *taskScheduler) preAdd(task Task) error {
return
merr
.
WrapErrServiceInternal
(
"task with the same segment exists"
)
}
if
GetTaskType
(
task
)
==
TaskTypeGrow
{
nodesWithSegment
:=
scheduler
.
distMgr
.
LeaderViewManager
.
GetSealedSegmentDist
(
task
.
SegmentID
())
replicaNodeMap
:=
utils
.
GroupNodesByReplica
(
scheduler
.
meta
.
ReplicaManager
,
task
.
CollectionID
(),
nodesWithSegment
)
if
_
,
ok
:=
replicaNodeMap
[
task
.
ReplicaID
()];
ok
{
return
merr
.
WrapErrServiceInternal
(
"segment loaded, it can be only balanced"
)
}
}
case
*
ChannelTask
:
index
:=
replicaChannelIndex
{
task
.
ReplicaID
(),
task
.
Channel
()}
if
old
,
ok
:=
scheduler
.
channelTasks
[
index
];
ok
{
...
...
@@ -283,6 +293,14 @@ func (scheduler *taskScheduler) preAdd(task Task) error {
return
merr
.
WrapErrServiceInternal
(
"task with the same channel exists"
)
}
if
GetTaskType
(
task
)
==
TaskTypeGrow
{
nodesWithChannel
:=
scheduler
.
distMgr
.
LeaderViewManager
.
GetChannelDist
(
task
.
Channel
())
replicaNodeMap
:=
utils
.
GroupNodesByReplica
(
scheduler
.
meta
.
ReplicaManager
,
task
.
CollectionID
(),
nodesWithChannel
)
if
_
,
ok
:=
replicaNodeMap
[
task
.
ReplicaID
()];
ok
{
return
merr
.
WrapErrServiceInternal
(
"channel subscribed, it can be only balanced"
)
}
}
default
:
panic
(
fmt
.
Sprintf
(
"preAdd: forget to process task type: %+v"
,
task
))
}
...
...
internal/querycoordv2/task/task_test.go
浏览文件 @
ae0f467c
...
...
@@ -185,14 +185,6 @@ func (suite *TaskSuite) TestSubscribeChannelTask() {
Return
(
&
schemapb
.
CollectionSchema
{
Name
:
"TestSubscribeChannelTask"
,
},
nil
)
channels
:=
make
([]
*
datapb
.
VchannelInfo
,
0
,
len
(
suite
.
subChannels
))
for
_
,
channel
:=
range
suite
.
subChannels
{
channels
=
append
(
channels
,
&
datapb
.
VchannelInfo
{
CollectionID
:
suite
.
collection
,
ChannelName
:
channel
,
UnflushedSegmentIds
:
[]
int64
{
suite
.
growingSegments
[
channel
]},
})
}
for
channel
,
segment
:=
range
suite
.
growingSegments
{
suite
.
broker
.
EXPECT
()
.
GetSegmentInfo
(
mock
.
Anything
,
segment
)
.
Return
(
&
datapb
.
GetSegmentInfoResponse
{
Infos
:
[]
*
datapb
.
SegmentInfo
{
...
...
@@ -262,6 +254,42 @@ func (suite *TaskSuite) TestSubscribeChannelTask() {
}
}
func
(
suite
*
TaskSuite
)
TestSubmitDuplicateSubscribeChannelTask
()
{
ctx
:=
context
.
Background
()
timeout
:=
10
*
time
.
Second
targetNode
:=
int64
(
3
)
tasks
:=
[]
Task
{}
for
_
,
channel
:=
range
suite
.
subChannels
{
task
,
err
:=
NewChannelTask
(
ctx
,
timeout
,
0
,
suite
.
collection
,
suite
.
replica
,
NewChannelAction
(
targetNode
,
ActionTypeGrow
,
channel
),
)
suite
.
NoError
(
err
)
tasks
=
append
(
tasks
,
task
)
}
views
:=
make
([]
*
meta
.
LeaderView
,
0
)
for
_
,
channel
:=
range
suite
.
subChannels
{
views
=
append
(
views
,
&
meta
.
LeaderView
{
ID
:
targetNode
,
CollectionID
:
suite
.
collection
,
Channel
:
channel
,
})
}
suite
.
dist
.
LeaderViewManager
.
Update
(
targetNode
,
views
...
)
for
_
,
task
:=
range
tasks
{
err
:=
suite
.
scheduler
.
Add
(
task
)
suite
.
Equal
(
TaskStatusCanceled
,
task
.
Status
())
suite
.
Error
(
err
)
}
}
func
(
suite
*
TaskSuite
)
TestUnsubscribeChannelTask
()
{
ctx
:=
context
.
Background
()
timeout
:=
10
*
time
.
Second
...
...
@@ -1045,7 +1073,6 @@ func (suite *TaskSuite) TestNoExecutor() {
CollectionID
:
suite
.
collection
,
ChannelName
:
channel
.
ChannelName
,
}))
tasks
:=
[]
Task
{}
segments
:=
make
([]
*
datapb
.
SegmentBinlogs
,
0
)
for
_
,
segment
:=
range
suite
.
loadSegments
{
segments
=
append
(
segments
,
&
datapb
.
SegmentBinlogs
{
...
...
@@ -1061,7 +1088,6 @@ func (suite *TaskSuite) TestNoExecutor() {
NewSegmentAction
(
targetNode
,
ActionTypeGrow
,
channel
.
GetChannelName
(),
segment
),
)
suite
.
NoError
(
err
)
tasks
=
append
(
tasks
,
task
)
err
=
suite
.
scheduler
.
Add
(
task
)
suite
.
NoError
(
err
)
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录