Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
milvus
milvus
提交
48bdeb56
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,发现更多精彩内容 >>
未验证
提交
48bdeb56
编写于
11月 26, 2021
作者:
G
godchen
提交者:
GitHub
11月 26, 2021
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Merge watch delta channel positions (#12309)
Signed-off-by:
N
godchen
<
qingxiang.chen@zilliz.com
>
上级
f31ed089
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
21 addition
and
24 deletion
+21
-24
internal/querycoord/task.go
internal/querycoord/task.go
+21
-24
未找到文件。
internal/querycoord/task.go
浏览文件 @
48bdeb56
...
...
@@ -406,14 +406,12 @@ func (lct *loadCollectionTask) execute(ctx context.Context) error {
loadSegmentReqs
=
append
(
loadSegmentReqs
,
loadSegmentReq
)
}
if
len
(
watchDeltaChannels
)
!=
len
(
recoveryInfo
.
Channels
)
{
for
_
,
info
:=
range
recoveryInfo
.
Channels
{
deltaChannel
,
err
:=
generateWatchDeltaChannelInfo
(
info
)
if
err
!=
nil
{
return
err
}
watchDeltaChannels
=
append
(
watchDeltaChannels
,
deltaChannel
)
for
_
,
info
:=
range
recoveryInfo
.
Channels
{
deltaChannel
,
err
:=
generateWatchDeltaChannelInfo
(
info
)
if
err
!=
nil
{
return
err
}
watchDeltaChannels
=
append
(
watchDeltaChannels
,
deltaChannel
)
}
for
_
,
info
:=
range
recoveryInfo
.
Channels
{
...
...
@@ -457,12 +455,13 @@ func (lct *loadCollectionTask) execute(ctx context.Context) error {
}
}
mergedDeltaChannels
:=
mergeWatchDeltaChannelInfo
(
watchDeltaChannels
)
msgBase
:=
proto
.
Clone
(
lct
.
Base
)
.
(
*
commonpb
.
MsgBase
)
msgBase
.
MsgType
=
commonpb
.
MsgType_WatchDeltaChannels
watchDeltaChannelReq
:=
&
querypb
.
WatchDeltaChannelsRequest
{
Base
:
msgBase
,
CollectionID
:
collectionID
,
Infos
:
watch
DeltaChannels
,
Infos
:
merged
DeltaChannels
,
}
// If meta is not updated here, deltaChannel meta will not be available when loadSegment reschedule
lct
.
meta
.
setDeltaChannel
(
watchDeltaChannelReq
.
CollectionID
,
watchDeltaChannelReq
.
Infos
)
...
...
@@ -1570,14 +1569,12 @@ func (ht *handoffTask) execute(ctx context.Context) error {
}
}
}
if
len
(
watchDeltaChannels
)
!=
len
(
recoveryInfo
.
Channels
)
{
for
_
,
info
:=
range
recoveryInfo
.
Channels
{
deltaChannel
,
err
:=
generateWatchDeltaChannelInfo
(
info
)
if
err
!=
nil
{
return
err
}
watchDeltaChannels
=
append
(
watchDeltaChannels
,
deltaChannel
)
for
_
,
info
:=
range
recoveryInfo
.
Channels
{
deltaChannel
,
err
:=
generateWatchDeltaChannelInfo
(
info
)
if
err
!=
nil
{
return
err
}
watchDeltaChannels
=
append
(
watchDeltaChannels
,
deltaChannel
)
}
if
!
findBinlog
{
...
...
@@ -1585,12 +1582,13 @@ func (ht *handoffTask) execute(ctx context.Context) error {
ht
.
setResultInfo
(
err
)
return
err
}
mergedDeltaChannels
:=
mergeWatchDeltaChannelInfo
(
watchDeltaChannels
)
msgBase
:=
proto
.
Clone
(
ht
.
Base
)
.
(
*
commonpb
.
MsgBase
)
msgBase
.
MsgType
=
commonpb
.
MsgType_WatchDeltaChannels
watchDeltaChannelReq
:=
&
querypb
.
WatchDeltaChannelsRequest
{
Base
:
msgBase
,
CollectionID
:
collectionID
,
Infos
:
watch
DeltaChannels
,
Infos
:
merged
DeltaChannels
,
}
// If meta is not updated here, deltaChannel meta will not be available when loadSegment reschedule
ht
.
meta
.
setDeltaChannel
(
watchDeltaChannelReq
.
CollectionID
,
watchDeltaChannelReq
.
Infos
)
...
...
@@ -1962,22 +1960,21 @@ func (lbt *loadBalanceTask) execute(ctx context.Context) error {
loadSegmentReqs
=
append
(
loadSegmentReqs
,
loadSegmentReq
)
}
if
len
(
watchDeltaChannels
)
!=
len
(
recoveryInfo
.
Channels
)
{
for
_
,
info
:=
range
recoveryInfo
.
Channels
{
deltaChannel
,
err
:=
generateWatchDeltaChannelInfo
(
info
)
if
err
!=
nil
{
return
err
}
watchDeltaChannels
=
append
(
watchDeltaChannels
,
deltaChannel
)
for
_
,
info
:=
range
recoveryInfo
.
Channels
{
deltaChannel
,
err
:=
generateWatchDeltaChannelInfo
(
info
)
if
err
!=
nil
{
return
err
}
watchDeltaChannels
=
append
(
watchDeltaChannels
,
deltaChannel
)
}
}
mergedDeltaChannels
:=
mergeWatchDeltaChannelInfo
(
watchDeltaChannels
)
msgBase
:=
proto
.
Clone
(
lbt
.
Base
)
.
(
*
commonpb
.
MsgBase
)
msgBase
.
MsgType
=
commonpb
.
MsgType_WatchDeltaChannels
watchDeltaChannelReq
:=
&
querypb
.
WatchDeltaChannelsRequest
{
Base
:
msgBase
,
CollectionID
:
collectionID
,
Infos
:
watch
DeltaChannels
,
Infos
:
merged
DeltaChannels
,
}
// If meta is not updated here, deltaChannel meta will not be available when loadSegment reschedule
lbt
.
meta
.
setDeltaChannel
(
watchDeltaChannelReq
.
CollectionID
,
watchDeltaChannelReq
.
Infos
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录