Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
milvus
milvus
提交
b07b2484
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,发现更多精彩内容 >>
提交
b07b2484
编写于
2月 07, 2021
作者:
B
bigsheeper
提交者:
yefu.chen
2月 07, 2021
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix error when loading
Signed-off-by:
N
bigsheeper
<
yihao.dai@zilliz.com
>
上级
8f4995da
变更
5
显示空白变更内容
内联
并排
Showing
5 changed file
with
31 addition
and
12 deletion
+31
-12
internal/proxynode/task.go
internal/proxynode/task.go
+3
-6
internal/querynode/collection_replica.go
internal/querynode/collection_replica.go
+21
-1
internal/querynode/index_loader.go
internal/querynode/index_loader.go
+2
-1
internal/querynode/load_service.go
internal/querynode/load_service.go
+3
-2
internal/querynode/query_node.go
internal/querynode/query_node.go
+2
-2
未找到文件。
internal/proxynode/task.go
浏览文件 @
b07b2484
...
...
@@ -397,17 +397,14 @@ func (dct *DropCollectionTask) Execute() error {
if
err
!=
nil
{
return
err
}
dct
.
result
,
err
=
dct
.
masterClient
.
DropCollection
(
dct
.
DropCollectionRequest
)
if
err
!=
nil
{
return
err
dct
.
result
,
_
=
dct
.
masterClient
.
DropCollection
(
dct
.
DropCollectionRequest
)
if
dct
.
result
.
ErrorCode
!=
commonpb
.
ErrorCode_SUCCESS
{
return
errors
.
New
(
dct
.
result
.
Reason
)
}
err
=
globalInsertChannelsMap
.
closeInsertMsgStream
(
collID
)
if
err
!=
nil
{
return
err
}
return
nil
}
...
...
internal/querynode/collection_replica.go
浏览文件 @
b07b2484
...
...
@@ -61,6 +61,7 @@ type collectionReplica interface {
getSegmentStatistics
()
[]
*
internalpb2
.
SegmentStats
getEnabledSealedSegmentsBySegmentType
(
segType
segmentType
)
([]
UniqueID
,
[]
UniqueID
,
[]
UniqueID
)
getSealedSegmentsBySegmentType
(
segType
segmentType
)
([]
UniqueID
,
[]
UniqueID
,
[]
UniqueID
)
replaceGrowingSegmentBySealedSegment
(
segment
*
Segment
)
error
getTSafe
()
tSafe
...
...
@@ -477,7 +478,7 @@ func (colReplica *collectionReplicaImpl) getEnabledSealedSegmentsBySegmentType(s
}
if
segment
.
getType
()
==
segType
{
targetCollectionIDs
=
append
(
targetCollectionIDs
,
segment
.
collectionID
)
targetPartitionIDs
=
append
(
targetPartitionIDs
,
segment
.
collec
tionID
)
targetPartitionIDs
=
append
(
targetPartitionIDs
,
segment
.
parti
tionID
)
targetSegmentIDs
=
append
(
targetSegmentIDs
,
segment
.
segmentID
)
}
}
...
...
@@ -486,6 +487,25 @@ func (colReplica *collectionReplicaImpl) getEnabledSealedSegmentsBySegmentType(s
return
targetCollectionIDs
,
targetPartitionIDs
,
targetSegmentIDs
}
func
(
colReplica
*
collectionReplicaImpl
)
getSealedSegmentsBySegmentType
(
segType
segmentType
)
([]
UniqueID
,
[]
UniqueID
,
[]
UniqueID
)
{
colReplica
.
mu
.
RLock
()
defer
colReplica
.
mu
.
RUnlock
()
targetCollectionIDs
:=
make
([]
UniqueID
,
0
)
targetPartitionIDs
:=
make
([]
UniqueID
,
0
)
targetSegmentIDs
:=
make
([]
UniqueID
,
0
)
for
_
,
segment
:=
range
colReplica
.
segments
{
if
segment
.
getType
()
==
segType
{
targetCollectionIDs
=
append
(
targetCollectionIDs
,
segment
.
collectionID
)
targetPartitionIDs
=
append
(
targetPartitionIDs
,
segment
.
partitionID
)
targetSegmentIDs
=
append
(
targetSegmentIDs
,
segment
.
segmentID
)
}
}
return
targetCollectionIDs
,
targetPartitionIDs
,
targetSegmentIDs
}
func
(
colReplica
*
collectionReplicaImpl
)
replaceGrowingSegmentBySealedSegment
(
segment
*
Segment
)
error
{
colReplica
.
mu
.
Lock
()
defer
colReplica
.
mu
.
Unlock
()
...
...
internal/querynode/index_loader.go
浏览文件 @
b07b2484
...
...
@@ -41,8 +41,9 @@ type loadIndex struct {
}
func
(
loader
*
indexLoader
)
doLoadIndex
(
wg
*
sync
.
WaitGroup
)
{
collectionIDs
,
_
,
segmentIDs
:=
loader
.
replica
.
get
Enabled
SealedSegmentsBySegmentType
(
segTypeSealed
)
collectionIDs
,
_
,
segmentIDs
:=
loader
.
replica
.
getSealedSegmentsBySegmentType
(
segTypeSealed
)
if
len
(
collectionIDs
)
<=
0
{
wg
.
Done
()
return
}
fmt
.
Println
(
"do load index for sealed segments:"
,
segmentIDs
)
...
...
internal/querynode/load_service.go
浏览文件 @
b07b2484
...
...
@@ -40,8 +40,9 @@ func (s *loadService) close() {
}
func
(
s
*
loadService
)
loadSegmentActively
(
wg
*
sync
.
WaitGroup
)
{
collectionIDs
,
partitionIDs
,
segmentIDs
:=
s
.
segLoader
.
replica
.
get
Enabled
SealedSegmentsBySegmentType
(
segTypeGrowing
)
collectionIDs
,
partitionIDs
,
segmentIDs
:=
s
.
segLoader
.
replica
.
getSealedSegmentsBySegmentType
(
segTypeGrowing
)
if
len
(
collectionIDs
)
<=
0
{
wg
.
Done
()
return
}
fmt
.
Println
(
"do load segment for growing segments:"
,
segmentIDs
)
...
...
@@ -92,7 +93,7 @@ func (s *loadService) loadSegmentInternal(collectionID UniqueID, partitionID Uni
_
,
buildID
,
errIndex
:=
s
.
segLoader
.
indexLoader
.
getIndexInfo
(
collectionID
,
segmentID
)
if
errIndex
==
nil
{
// we don't need load to vector fields
vectorFields
,
err
:=
s
.
segLoader
.
replica
.
getVecFieldIDsByCollectionID
(
segment
ID
)
vectorFields
,
err
:=
s
.
segLoader
.
replica
.
getVecFieldIDsByCollectionID
(
collection
ID
)
if
err
!=
nil
{
return
err
}
...
...
internal/querynode/query_node.go
浏览文件 @
b07b2484
...
...
@@ -146,14 +146,14 @@ func (node *QueryNode) Start() error {
// init services and manager
node
.
dataSyncService
=
newDataSyncService
(
node
.
queryNodeLoopCtx
,
node
.
replica
)
node
.
searchService
=
newSearchService
(
node
.
queryNodeLoopCtx
,
node
.
replica
)
node
.
metaService
=
newMetaService
(
node
.
queryNodeLoopCtx
,
node
.
replica
)
//
node.metaService = newMetaService(node.queryNodeLoopCtx, node.replica)
node
.
loadService
=
newLoadService
(
node
.
queryNodeLoopCtx
,
node
.
masterClient
,
node
.
dataClient
,
node
.
indexClient
,
node
.
replica
,
node
.
dataSyncService
.
dmStream
)
node
.
statsService
=
newStatsService
(
node
.
queryNodeLoopCtx
,
node
.
replica
,
node
.
loadService
.
segLoader
.
indexLoader
.
fieldStatsChan
)
// start services
go
node
.
dataSyncService
.
start
()
go
node
.
searchService
.
start
()
go
node
.
metaService
.
start
()
//
go node.metaService.start()
go
node
.
loadService
.
start
()
go
node
.
statsService
.
start
()
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录