Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
milvus
milvus
提交
7342e075
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,发现更多精彩内容 >>
提交
7342e075
编写于
2月 07, 2021
作者:
B
bigsheeper
提交者:
yefu.chen
2月 07, 2021
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix index and flush errors, and fix master crash error
Signed-off-by:
N
bigsheeper
<
yihao.dai@zilliz.com
>
上级
2c9e2267
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
23 addition
and
4 deletion
+23
-4
cmd/distributed/components/master_service.go
cmd/distributed/components/master_service.go
+3
-0
internal/datanode/flow_graph_insert_buffer_node.go
internal/datanode/flow_graph_insert_buffer_node.go
+5
-0
internal/indexservice/indexservice.go
internal/indexservice/indexservice.go
+7
-2
internal/indexservice/node_mgr.go
internal/indexservice/node_mgr.go
+4
-0
internal/masterservice/task.go
internal/masterservice/task.go
+2
-0
internal/querynode/index_loader.go
internal/querynode/index_loader.go
+0
-1
internal/querynode/load_service.go
internal/querynode/load_service.go
+2
-1
未找到文件。
cmd/distributed/components/master_service.go
浏览文件 @
7342e075
...
...
@@ -103,6 +103,9 @@ func NewMasterService(ctx context.Context) (*MasterService, error) {
is
.
Params
.
Init
()
log
.
Printf
(
"index service address : %s"
,
is
.
Params
.
Address
)
indexService
:=
isc
.
NewClient
(
is
.
Params
.
Address
)
if
err
=
indexService
.
Init
();
err
!=
nil
{
return
nil
,
err
}
if
err
=
svr
.
SetIndexService
(
indexService
);
err
!=
nil
{
return
nil
,
err
...
...
internal/datanode/flow_graph_insert_buffer_node.go
浏览文件 @
7342e075
...
...
@@ -456,6 +456,11 @@ func (ibNode *insertBufferNode) Operate(in []*Msg) []*Msg {
continue
}
}
err
:=
ibNode
.
completeFlush
(
currentSegID
)
if
err
!=
nil
{
log
.
Println
(
err
)
}
log
.
Println
(
"Flush completed"
)
}
}
...
...
internal/indexservice/indexservice.go
浏览文件 @
7342e075
...
...
@@ -2,6 +2,7 @@ package indexservice
import
(
"context"
"fmt"
"log"
"sync"
"time"
...
...
@@ -177,6 +178,7 @@ func (i *ServiceImpl) GetStatisticsChannel() (string, error) {
}
func
(
i
*
ServiceImpl
)
BuildIndex
(
req
*
indexpb
.
BuildIndexRequest
)
(
*
indexpb
.
BuildIndexResponse
,
error
)
{
fmt
.
Println
(
"builder building index ..., indexName = "
,
req
.
IndexName
,
"indexID = "
,
req
.
IndexID
,
"dataPath = "
,
req
.
DataPaths
)
ret
:=
&
indexpb
.
BuildIndexResponse
{
Status
:
&
commonpb
.
Status
{
ErrorCode
:
commonpb
.
ErrorCode_UNEXPECTED_ERROR
,
...
...
@@ -244,10 +246,13 @@ func (i *ServiceImpl) GetIndexStates(req *indexpb.IndexStatesRequest) (*indexpb.
}
func
(
i
*
ServiceImpl
)
GetIndexFilePaths
(
req
*
indexpb
.
IndexFilePathsRequest
)
(
*
indexpb
.
IndexFilePathsResponse
,
error
)
{
var
indexPaths
[]
*
indexpb
.
IndexFilePathInfo
var
indexPaths
[]
*
indexpb
.
IndexFilePathInfo
=
nil
for
_
,
indexID
:=
range
req
.
IndexBuildIDs
{
indexPathInfo
,
_
:=
i
.
metaTable
.
GetIndexFilePathInfo
(
indexID
)
indexPathInfo
,
err
:=
i
.
metaTable
.
GetIndexFilePathInfo
(
indexID
)
if
err
!=
nil
{
return
nil
,
err
}
indexPaths
=
append
(
indexPaths
,
indexPathInfo
)
}
...
...
internal/indexservice/node_mgr.go
浏览文件 @
7342e075
...
...
@@ -30,6 +30,10 @@ func (i *ServiceImpl) addNode(nodeID UniqueID, req *indexpb.RegisterNodeRequest)
if
err
!=
nil
{
return
err
}
err
=
nodeClient
.
Init
()
if
err
!=
nil
{
return
err
}
item
:=
&
PQItem
{
value
:
nodeClient
,
key
:
nodeID
,
...
...
internal/masterservice/task.go
浏览文件 @
7342e075
package
masterservice
import
(
"fmt"
"log"
"github.com/golang/protobuf/proto"
...
...
@@ -597,6 +598,7 @@ func (t *CreateIndexReqTask) Execute() error {
indexParams
:
t
.
Req
.
ExtraParams
,
}
t
.
core
.
indexTaskQueue
<-
&
task
fmt
.
Println
(
"create index task enqueue, segID = "
,
seg
)
}
return
nil
}
...
...
internal/querynode/index_loader.go
浏览文件 @
7342e075
...
...
@@ -323,7 +323,6 @@ func (loader *indexLoader) getIndexPaths(indexBuildID UniqueID) ([]string, error
}
indexFilePathRequest
:=
&
indexpb
.
IndexFilePathsRequest
{
// TODO: rename indexIDs to buildIDs
IndexBuildIDs
:
[]
UniqueID
{
indexBuildID
},
}
pathResponse
,
err
:=
loader
.
indexClient
.
GetIndexFilePaths
(
indexFilePathRequest
)
...
...
internal/querynode/load_service.go
浏览文件 @
7342e075
...
...
@@ -10,7 +10,7 @@ import (
"github.com/zilliztech/milvus-distributed/internal/msgstream"
)
const
indexCheckInterval
=
1
const
indexCheckInterval
=
3
type
loadService
struct
{
ctx
context
.
Context
...
...
@@ -115,6 +115,7 @@ func (s *loadService) loadSegmentInternal(collectionID UniqueID, partitionID Uni
return
err
}
if
errIndex
==
nil
{
fmt
.
Println
(
"loading index..."
)
indexPaths
,
err
:=
s
.
segLoader
.
indexLoader
.
getIndexPaths
(
buildID
)
if
err
!=
nil
{
return
err
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录