Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
milvus
milvus
提交
338e3236
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 搜索 >>
未验证
提交
338e3236
编写于
9月 18, 2021
作者:
B
bigsheeper
提交者:
GitHub
9月 18, 2021
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Return error if setSegment failed when loadSegment (#8075)
Signed-off-by:
N
bigsheeper
<
yihao.dai@zilliz.com
>
上级
a6ab41e4
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
52 addition
and
11 deletion
+52
-11
internal/querynode/segment_loader.go
internal/querynode/segment_loader.go
+5
-5
internal/querynode/segment_loader_test.go
internal/querynode/segment_loader_test.go
+47
-6
未找到文件。
internal/querynode/segment_loader.go
浏览文件 @
338e3236
...
...
@@ -83,14 +83,15 @@ func (loader *segmentLoader) loadSegment(req *querypb.LoadSegmentsRequest, onSer
deleteSegment
(
s
)
}
}
setSegments
:=
func
()
{
setSegments
:=
func
()
error
{
for
_
,
s
:=
range
newSegments
{
err
:=
loader
.
historicalReplica
.
setSegment
(
s
)
if
err
!=
nil
{
log
.
Warn
(
err
.
Error
()
)
deleteSegment
(
s
)
segmentGC
(
)
return
err
}
}
return
nil
}
// start to load
...
...
@@ -142,9 +143,8 @@ func (loader *segmentLoader) loadSegment(req *querypb.LoadSegmentsRequest, onSer
}
newSegments
=
append
(
newSegments
,
segment
)
}
setSegments
()
return
nil
return
setSegments
()
}
func
(
loader
*
segmentLoader
)
loadSegmentInternal
(
collectionID
UniqueID
,
segment
*
Segment
,
segmentLoadInfo
*
querypb
.
SegmentLoadInfo
)
error
{
...
...
internal/querynode/segment_loader_test.go
浏览文件 @
338e3236
...
...
@@ -31,12 +31,6 @@ func TestSegmentLoader_loadSegment(t *testing.T) {
ctx
,
cancel
:=
context
.
WithCancel
(
context
.
Background
())
defer
cancel
()
historical
,
err
:=
genSimpleHistorical
(
ctx
)
assert
.
NoError
(
t
,
err
)
err
=
historical
.
replica
.
removeSegment
(
defaultSegmentID
)
assert
.
NoError
(
t
,
err
)
kv
,
err
:=
genEtcdKV
()
assert
.
NoError
(
t
,
err
)
...
...
@@ -46,6 +40,11 @@ func TestSegmentLoader_loadSegment(t *testing.T) {
assert
.
NoError
(
t
,
err
)
t
.
Run
(
"test no segment meta"
,
func
(
t
*
testing
.
T
)
{
historical
,
err
:=
genSimpleHistorical
(
ctx
)
assert
.
NoError
(
t
,
err
)
err
=
historical
.
replica
.
removeSegment
(
defaultSegmentID
)
assert
.
NoError
(
t
,
err
)
loader
:=
newSegmentLoader
(
ctx
,
nil
,
nil
,
historical
.
replica
,
kv
)
assert
.
NotNil
(
t
,
loader
)
...
...
@@ -76,6 +75,11 @@ func TestSegmentLoader_loadSegment(t *testing.T) {
})
t
.
Run
(
"test load segment"
,
func
(
t
*
testing
.
T
)
{
historical
,
err
:=
genSimpleHistorical
(
ctx
)
assert
.
NoError
(
t
,
err
)
err
=
historical
.
replica
.
removeSegment
(
defaultSegmentID
)
assert
.
NoError
(
t
,
err
)
loader
:=
newSegmentLoader
(
ctx
,
nil
,
nil
,
historical
.
replica
,
kv
)
assert
.
NotNil
(
t
,
loader
)
...
...
@@ -106,6 +110,43 @@ func TestSegmentLoader_loadSegment(t *testing.T) {
err
=
loader
.
loadSegment
(
req
,
true
)
assert
.
NoError
(
t
,
err
)
})
t
.
Run
(
"test set segment error"
,
func
(
t
*
testing
.
T
)
{
historical
,
err
:=
genSimpleHistorical
(
ctx
)
assert
.
NoError
(
t
,
err
)
err
=
historical
.
replica
.
removePartition
(
defaultPartitionID
)
assert
.
NoError
(
t
,
err
)
loader
:=
newSegmentLoader
(
ctx
,
nil
,
nil
,
historical
.
replica
,
kv
)
assert
.
NotNil
(
t
,
loader
)
req
:=
&
querypb
.
LoadSegmentsRequest
{
Base
:
&
commonpb
.
MsgBase
{
MsgType
:
commonpb
.
MsgType_WatchQueryChannels
,
MsgID
:
rand
.
Int63
(),
},
NodeID
:
0
,
Schema
:
schema
,
LoadCondition
:
querypb
.
TriggerCondition_grpcRequest
,
Infos
:
[]
*
querypb
.
SegmentLoadInfo
{
{
SegmentID
:
defaultSegmentID
,
PartitionID
:
defaultPartitionID
,
CollectionID
:
defaultCollectionID
,
BinlogPaths
:
fieldBinlog
,
},
},
}
key
:=
fmt
.
Sprintf
(
"%s/%d"
,
queryCoordSegmentMetaPrefix
,
defaultSegmentID
)
segmentInfo
:=
&
querypb
.
SegmentInfo
{}
value
:=
proto
.
MarshalTextString
(
segmentInfo
)
err
=
kv
.
Save
(
key
,
value
)
assert
.
NoError
(
t
,
err
)
err
=
loader
.
loadSegment
(
req
,
true
)
assert
.
Error
(
t
,
err
)
})
}
func
TestSegmentLoader_notOnService
(
t
*
testing
.
T
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录