Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
milvus
milvus
提交
6bd57024
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,发现更多精彩内容 >>
提交
6bd57024
编写于
1月 04, 2021
作者:
Z
zhenshan.cao
提交者:
yefu.chen
1月 04, 2021
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add indexbuilder address to paramstable
Signed-off-by:
N
zhenshan.cao
<
zhenshan.cao@zilliz.com
>
上级
cb3ca1ab
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
74 addition
and
5 deletion
+74
-5
internal/master/param_table.go
internal/master/param_table.go
+10
-0
internal/master/param_table_test.go
internal/master/param_table_test.go
+5
-0
internal/util/paramtable/paramtable.go
internal/util/paramtable/paramtable.go
+59
-5
未找到文件。
internal/master/param_table.go
浏览文件 @
6bd57024
...
...
@@ -21,6 +21,7 @@ type ParamTable struct {
KvRootPath
string
WriteNodeSegKvSubPath
string
PulsarAddress
string
IndexBuilderAddress
string
// nodeID
ProxyIDList
[]
typeutil
.
UniqueID
...
...
@@ -71,6 +72,7 @@ func (p *ParamTable) Init() {
p
.
initKvRootPath
()
p
.
initWriteNodeSegKvSubPath
()
p
.
initPulsarAddress
()
p
.
initIndexBuilderAddress
()
p
.
initProxyIDList
()
p
.
initWriteNodeIDList
()
...
...
@@ -125,6 +127,14 @@ func (p *ParamTable) initPulsarAddress() {
p
.
PulsarAddress
=
addr
}
func
(
p
*
ParamTable
)
initIndexBuilderAddress
()
{
ret
,
err
:=
p
.
Load
(
"_IndexBuilderAddress"
)
if
err
!=
nil
{
panic
(
err
)
}
p
.
IndexBuilderAddress
=
ret
}
func
(
p
*
ParamTable
)
initMetaRootPath
()
{
rootPath
,
err
:=
p
.
Load
(
"etcd.rootPath"
)
if
err
!=
nil
{
...
...
internal/master/param_table_test.go
浏览文件 @
6bd57024
...
...
@@ -31,6 +31,11 @@ func TestParamTable_KVRootPath(t *testing.T) {
assert
.
Equal
(
t
,
path
,
"by-dev/kv"
)
}
func
TestParamTable_IndexBuilderAddress
(
t
*
testing
.
T
)
{
path
:=
Params
.
IndexBuilderAddress
assert
.
Equal
(
t
,
path
,
"localhost:31000"
)
}
func
TestParamTable_TopicNum
(
t
*
testing
.
T
)
{
num
:=
Params
.
TopicNum
fmt
.
Println
(
"TopicNum:"
,
num
)
...
...
internal/util/paramtable/paramtable.go
浏览文件 @
6bd57024
...
...
@@ -57,19 +57,40 @@ func (gp *BaseTable) Init() {
if
err
!=
nil
{
panic
(
err
)
}
gp
.
tryloadFromEnv
()
}
func
(
gp
*
BaseTable
)
tryloadFromEnv
()
{
minioAddress
:=
os
.
Getenv
(
"MINIO_ADDRESS"
)
if
minioAddress
==
""
{
minioAddress
=
"localhost:9000"
minioHost
,
err
:=
gp
.
Load
(
"minio.address"
)
if
err
!=
nil
{
panic
(
err
)
}
port
,
err
:=
gp
.
Load
(
"minio.port"
)
if
err
!=
nil
{
panic
(
err
)
}
minioAddress
=
minioHost
+
":"
+
port
}
err
=
gp
.
Save
(
"_MinioAddress"
,
minioAddress
)
err
:
=
gp
.
Save
(
"_MinioAddress"
,
minioAddress
)
if
err
!=
nil
{
panic
(
err
)
}
etcdAddress
:=
os
.
Getenv
(
"ETCD_ADDRESS"
)
if
etcdAddress
==
""
{
etcdAddress
=
"localhost:2379"
etcdHost
,
err
:=
gp
.
Load
(
"etcd.address"
)
if
err
!=
nil
{
panic
(
err
)
}
port
,
err
:=
gp
.
Load
(
"etcd.port"
)
if
err
!=
nil
{
panic
(
err
)
}
etcdAddress
=
etcdHost
+
":"
+
port
}
err
=
gp
.
Save
(
"_EtcdAddress"
,
etcdAddress
)
if
err
!=
nil
{
...
...
@@ -78,7 +99,15 @@ func (gp *BaseTable) Init() {
pulsarAddress
:=
os
.
Getenv
(
"PULSAR_ADDRESS"
)
if
pulsarAddress
==
""
{
pulsarAddress
=
"pulsar://localhost:6650"
pulsarHost
,
err
:=
gp
.
Load
(
"pulsar.address"
)
if
err
!=
nil
{
panic
(
err
)
}
port
,
err
:=
gp
.
Load
(
"pulsar.port"
)
if
err
!=
nil
{
panic
(
err
)
}
pulsarAddress
=
"pulsar://"
+
pulsarHost
+
":"
+
port
}
err
=
gp
.
Save
(
"_PulsarAddress"
,
pulsarAddress
)
if
err
!=
nil
{
...
...
@@ -87,12 +116,37 @@ func (gp *BaseTable) Init() {
masterAddress
:=
os
.
Getenv
(
"MASTER_ADDRESS"
)
if
masterAddress
==
""
{
masterAddress
=
"localhost:53100"
masterHost
,
err
:=
gp
.
Load
(
"master.address"
)
if
err
!=
nil
{
panic
(
err
)
}
port
,
err
:=
gp
.
Load
(
"master.port"
)
if
err
!=
nil
{
panic
(
err
)
}
masterAddress
=
masterHost
+
":"
+
port
}
err
=
gp
.
Save
(
"_MasterAddress"
,
masterAddress
)
if
err
!=
nil
{
panic
(
err
)
}
indexBuilderAddress
:=
os
.
Getenv
(
"INDEX_BUILDER_ADDRESS"
)
if
indexBuilderAddress
==
""
{
indexBuilderHost
,
err
:=
gp
.
Load
(
"indexBuilder.address"
)
if
err
!=
nil
{
panic
(
err
)
}
port
,
err
:=
gp
.
Load
(
"indexBuilder.port"
)
if
err
!=
nil
{
panic
(
err
)
}
indexBuilderAddress
=
indexBuilderHost
+
":"
+
port
}
err
=
gp
.
Save
(
"_IndexBuilderAddress"
,
indexBuilderAddress
)
if
err
!=
nil
{
panic
(
err
)
}
}
func
(
gp
*
BaseTable
)
Load
(
key
string
)
(
string
,
error
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录