Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
milvus
milvus
提交
7efb02a4
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 搜索 >>
未验证
提交
7efb02a4
编写于
1月 09, 2022
作者:
C
Cai Yudong
提交者:
GitHub
1月 09, 2022
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Use PulsarConfig in GlobalParams for all components (#15046)
Signed-off-by:
N
yudong.cai
<
yudong.cai@zilliz.com
>
上级
e2d16ed8
变更
23
隐藏空白更改
内联
并排
Showing
23 changed file
with
79 addition
and
136 deletion
+79
-136
internal/datacoord/server.go
internal/datacoord/server.go
+1
-1
internal/datacoord/server_test.go
internal/datacoord/server_test.go
+1
-1
internal/datanode/data_node.go
internal/datanode/data_node.go
+1
-1
internal/datanode/data_node_test.go
internal/datanode/data_node_test.go
+1
-1
internal/datanode/data_sync_service_test.go
internal/datanode/data_sync_service_test.go
+1
-1
internal/datanode/flow_graph_insert_buffer_node_test.go
internal/datanode/flow_graph_insert_buffer_node_test.go
+4
-4
internal/proxy/proxy.go
internal/proxy/proxy.go
+1
-1
internal/proxy/task.go
internal/proxy/task.go
+1
-1
internal/querycoord/cluster_test.go
internal/querycoord/cluster_test.go
+1
-1
internal/querycoord/query_coord.go
internal/querycoord/query_coord.go
+1
-1
internal/querynode/load_service_test.go
internal/querynode/load_service_test.go
+1
-1
internal/querynode/mock_test.go
internal/querynode/mock_test.go
+1
-1
internal/querynode/query_collection_test.go
internal/querynode/query_collection_test.go
+1
-1
internal/querynode/query_node.go
internal/querynode/query_node.go
+1
-1
internal/querynode/query_node_test.go
internal/querynode/query_node_test.go
+1
-1
internal/querynode/stats_service_test.go
internal/querynode/stats_service_test.go
+2
-2
internal/rootcoord/dml_channels_test.go
internal/rootcoord/dml_channels_test.go
+1
-1
internal/rootcoord/root_coord.go
internal/rootcoord/root_coord.go
+3
-3
internal/rootcoord/root_coord_test.go
internal/rootcoord/root_coord_test.go
+4
-4
internal/rootcoord/timestamp_test.go
internal/rootcoord/timestamp_test.go
+1
-1
internal/rootcoord/timeticksync_test.go
internal/rootcoord/timeticksync_test.go
+1
-1
internal/util/paramtable/global_param.go
internal/util/paramtable/global_param.go
+40
-90
internal/util/paramtable/global_param_test.go
internal/util/paramtable/global_param_test.go
+9
-16
未找到文件。
internal/datacoord/server.go
浏览文件 @
7efb02a4
...
...
@@ -256,7 +256,7 @@ func (s *Server) Init() error {
func
(
s
*
Server
)
Start
()
error
{
var
err
error
m
:=
map
[
string
]
interface
{}{
"PulsarAddress"
:
Params
.
DataCoordCfg
.
Pulsar
Address
,
"PulsarAddress"
:
Params
.
PulsarCfg
.
Address
,
"ReceiveBufSize"
:
1024
,
"PulsarBufSize"
:
1024
}
err
=
s
.
msFactory
.
SetParams
(
m
)
...
...
internal/datacoord/server_test.go
浏览文件 @
7efb02a4
...
...
@@ -2237,7 +2237,7 @@ func newTestServer(t *testing.T, receiveCh chan interface{}, opts ...Option) *Se
var
err
error
factory
:=
msgstream
.
NewPmsFactory
()
m
:=
map
[
string
]
interface
{}{
"pulsarAddress"
:
Params
.
DataCoordCfg
.
Pulsar
Address
,
"pulsarAddress"
:
Params
.
PulsarCfg
.
Address
,
"receiveBufSize"
:
1024
,
"pulsarBufSize"
:
1024
,
}
...
...
internal/datanode/data_node.go
浏览文件 @
7efb02a4
...
...
@@ -221,7 +221,7 @@ func (node *DataNode) Init() error {
Params
.
DataNodeCfg
.
Refresh
()
m
:=
map
[
string
]
interface
{}{
"PulsarAddress"
:
Params
.
DataNodeCfg
.
Pulsar
Address
,
"PulsarAddress"
:
Params
.
PulsarCfg
.
Address
,
"ReceiveBufSize"
:
1024
,
"PulsarBufSize"
:
1024
,
}
...
...
internal/datanode/data_node_test.go
浏览文件 @
7efb02a4
...
...
@@ -235,7 +235,7 @@ func TestDataNode(t *testing.T) {
// pulsar produce
msFactory
:=
msgstream
.
NewPmsFactory
()
m
:=
map
[
string
]
interface
{}{
"pulsarAddress"
:
Params
.
DataNodeCfg
.
Pulsar
Address
,
"pulsarAddress"
:
Params
.
PulsarCfg
.
Address
,
"receiveBufSize"
:
1024
,
"pulsarBufSize"
:
1024
}
err
=
msFactory
.
SetParams
(
m
)
...
...
internal/datanode/data_sync_service_test.go
浏览文件 @
7efb02a4
...
...
@@ -177,7 +177,7 @@ func TestDataSyncService_Start(t *testing.T) {
defer
cancel
()
// init data node
pulsarURL
:=
Params
.
DataNodeCfg
.
Pulsar
Address
pulsarURL
:=
Params
.
PulsarCfg
.
Address
Factory
:=
&
MetaFactory
{}
collMeta
:=
Factory
.
GetCollectionMeta
(
UniqueID
(
0
),
"coll1"
)
...
...
internal/datanode/flow_graph_insert_buffer_node_test.go
浏览文件 @
7efb02a4
...
...
@@ -76,7 +76,7 @@ func TestFlowGraphInsertBufferNodeCreate(t *testing.T) {
msFactory
:=
msgstream
.
NewPmsFactory
()
m
:=
map
[
string
]
interface
{}{
"receiveBufSize"
:
1024
,
"pulsarAddress"
:
Params
.
DataNodeCfg
.
Pulsar
Address
,
"pulsarAddress"
:
Params
.
PulsarCfg
.
Address
,
"pulsarBufSize"
:
1024
}
err
=
msFactory
.
SetParams
(
m
)
assert
.
Nil
(
t
,
err
)
...
...
@@ -166,7 +166,7 @@ func TestFlowGraphInsertBufferNode_Operate(t *testing.T) {
msFactory
:=
msgstream
.
NewPmsFactory
()
m
:=
map
[
string
]
interface
{}{
"receiveBufSize"
:
1024
,
"pulsarAddress"
:
Params
.
DataNodeCfg
.
Pulsar
Address
,
"pulsarAddress"
:
Params
.
PulsarCfg
.
Address
,
"pulsarBufSize"
:
1024
}
err
=
msFactory
.
SetParams
(
m
)
assert
.
Nil
(
t
,
err
)
...
...
@@ -372,7 +372,7 @@ func TestFlowGraphInsertBufferNode_AutoFlush(t *testing.T) {
msFactory
:=
msgstream
.
NewPmsFactory
()
m
:=
map
[
string
]
interface
{}{
"receiveBufSize"
:
1024
,
"pulsarAddress"
:
Params
.
DataNodeCfg
.
Pulsar
Address
,
"pulsarAddress"
:
Params
.
PulsarCfg
.
Address
,
"pulsarBufSize"
:
1024
}
err
=
msFactory
.
SetParams
(
m
)
assert
.
Nil
(
t
,
err
)
...
...
@@ -646,7 +646,7 @@ func TestInsertBufferNode_bufferInsertMsg(t *testing.T) {
msFactory
:=
msgstream
.
NewPmsFactory
()
m
:=
map
[
string
]
interface
{}{
"receiveBufSize"
:
1024
,
"pulsarAddress"
:
Params
.
DataNodeCfg
.
Pulsar
Address
,
"pulsarAddress"
:
Params
.
PulsarCfg
.
Address
,
"pulsarBufSize"
:
1024
}
err
=
msFactory
.
SetParams
(
m
)
assert
.
Nil
(
t
,
err
)
...
...
internal/proxy/proxy.go
浏览文件 @
7efb02a4
...
...
@@ -177,7 +177,7 @@ func (node *Proxy) Init() error {
}
m
:=
map
[
string
]
interface
{}{
"PulsarAddress"
:
Params
.
P
roxyCfg
.
Pulsar
Address
,
"PulsarAddress"
:
Params
.
P
ulsarCfg
.
Address
,
"PulsarBufSize"
:
1024
}
log
.
Debug
(
"set parameters for ms factory"
,
zap
.
String
(
"role"
,
typeutil
.
ProxyRole
),
zap
.
Any
(
"parameters"
,
m
))
if
err
:=
node
.
msFactory
.
SetParams
(
m
);
err
!=
nil
{
...
...
internal/proxy/task.go
浏览文件 @
7efb02a4
...
...
@@ -891,7 +891,7 @@ func (it *insertTask) _assignSegmentID(stream msgstream.MsgStream, pack *msgstre
return
0
}
threshold
:=
Params
.
P
roxyCfg
.
Pulsar
MaxMessageSize
threshold
:=
Params
.
P
ulsarCfg
.
MaxMessageSize
// not accurate
/* #nosec G103 */
getFixedSizeOfInsertMsg
:=
func
(
msg
*
msgstream
.
InsertMsg
)
int
{
...
...
internal/querycoord/cluster_test.go
浏览文件 @
7efb02a4
...
...
@@ -469,7 +469,7 @@ func TestGrpcRequest(t *testing.T) {
clusterSession
.
Register
()
factory
:=
msgstream
.
NewPmsFactory
()
m
:=
map
[
string
]
interface
{}{
"PulsarAddress"
:
Params
.
QueryCoordCfg
.
Pulsar
Address
,
"PulsarAddress"
:
Params
.
PulsarCfg
.
Address
,
"ReceiveBufSize"
:
1024
,
"PulsarBufSize"
:
1024
}
err
=
factory
.
SetParams
(
m
)
...
...
internal/querycoord/query_coord.go
浏览文件 @
7efb02a4
...
...
@@ -191,7 +191,7 @@ func (qc *QueryCoord) Init() error {
// Start function starts the goroutines to watch the meta and node updates
func
(
qc
*
QueryCoord
)
Start
()
error
{
m
:=
map
[
string
]
interface
{}{
"PulsarAddress"
:
Params
.
QueryCoordCfg
.
Pulsar
Address
,
"PulsarAddress"
:
Params
.
PulsarCfg
.
Address
,
"ReceiveBufSize"
:
1024
,
"PulsarBufSize"
:
1024
}
err
:=
qc
.
msFactory
.
SetParams
(
m
)
...
...
internal/querynode/load_service_test.go
浏览文件 @
7efb02a4
...
...
@@ -928,7 +928,7 @@ func doInsert(ctx context.Context, collectionID UniqueID, partitionID UniqueID,
msFactory
:=
msgstream
.
NewPmsFactory
()
m
:=
map
[
string
]
interface
{}{
"receiveBufSize"
:
receiveBufSize
,
"pulsarAddress"
:
Params
.
QueryNodeCfg
.
Pulsar
Address
,
"pulsarAddress"
:
Params
.
PulsarCfg
.
Address
,
"pulsarBufSize"
:
1024
}
err
:=
msFactory
.
SetParams
(
m
)
if
err
!=
nil
{
...
...
internal/querynode/mock_test.go
浏览文件 @
7efb02a4
...
...
@@ -382,7 +382,7 @@ func genEtcdKV() (*etcdkv.EtcdKV, error) {
func
genFactory
()
(
msgstream
.
Factory
,
error
)
{
const
receiveBufSize
=
1024
pulsarURL
:=
Params
.
QueryNodeCfg
.
Pulsar
Address
pulsarURL
:=
Params
.
PulsarCfg
.
Address
msFactory
:=
msgstream
.
NewPmsFactory
()
m
:=
map
[
string
]
interface
{}{
"receiveBufSize"
:
receiveBufSize
,
...
...
internal/querynode/query_collection_test.go
浏览文件 @
7efb02a4
...
...
@@ -126,7 +126,7 @@ func updateTSafe(queryCollection *queryCollection, timestamp Timestamp) error {
func
TestQueryCollection_withoutVChannel
(
t
*
testing
.
T
)
{
ctx
:=
context
.
Background
()
m
:=
map
[
string
]
interface
{}{
"PulsarAddress"
:
Params
.
QueryNodeCfg
.
Pulsar
Address
,
"PulsarAddress"
:
Params
.
PulsarCfg
.
Address
,
"ReceiveBufSize"
:
1024
,
"PulsarBufSize"
:
1024
}
factory
:=
msgstream
.
NewPmsFactory
()
...
...
internal/querynode/query_node.go
浏览文件 @
7efb02a4
...
...
@@ -250,7 +250,7 @@ func (node *QueryNode) Init() error {
func
(
node
*
QueryNode
)
Start
()
error
{
var
err
error
m
:=
map
[
string
]
interface
{}{
"PulsarAddress"
:
Params
.
QueryNodeCfg
.
Pulsar
Address
,
"PulsarAddress"
:
Params
.
PulsarCfg
.
Address
,
"ReceiveBufSize"
:
1024
,
"PulsarBufSize"
:
1024
}
err
=
node
.
msFactory
.
SetParams
(
m
)
...
...
internal/querynode/query_node_test.go
浏览文件 @
7efb02a4
...
...
@@ -223,7 +223,7 @@ func makeNewChannelNames(names []string, suffix string) []string {
func
newMessageStreamFactory
()
(
msgstream
.
Factory
,
error
)
{
const
receiveBufSize
=
1024
pulsarURL
:=
Params
.
QueryNodeCfg
.
Pulsar
Address
pulsarURL
:=
Params
.
PulsarCfg
.
Address
msFactory
:=
msgstream
.
NewPmsFactory
()
m
:=
map
[
string
]
interface
{}{
"receiveBufSize"
:
receiveBufSize
,
...
...
internal/querynode/stats_service_test.go
浏览文件 @
7efb02a4
...
...
@@ -31,7 +31,7 @@ func TestStatsService_start(t *testing.T) {
msFactory
:=
msgstream
.
NewPmsFactory
()
m
:=
map
[
string
]
interface
{}{
"PulsarAddress"
:
Params
.
QueryNodeCfg
.
Pulsar
Address
,
"PulsarAddress"
:
Params
.
PulsarCfg
.
Address
,
"ReceiveBufSize"
:
1024
,
"PulsarBufSize"
:
1024
}
msFactory
.
SetParams
(
m
)
...
...
@@ -55,7 +55,7 @@ func TestSegmentManagement_sendSegmentStatistic(t *testing.T) {
msFactory
:=
msgstream
.
NewPmsFactory
()
m
:=
map
[
string
]
interface
{}{
"receiveBufSize"
:
receiveBufSize
,
"pulsarAddress"
:
Params
.
QueryNodeCfg
.
Pulsar
Address
,
"pulsarAddress"
:
Params
.
PulsarCfg
.
Address
,
"pulsarBufSize"
:
1024
}
err
=
msFactory
.
SetParams
(
m
)
assert
.
Nil
(
t
,
err
)
...
...
internal/rootcoord/dml_channels_test.go
浏览文件 @
7efb02a4
...
...
@@ -42,7 +42,7 @@ func TestDmlChannels(t *testing.T) {
Params
.
Init
()
m
:=
map
[
string
]
interface
{}{
"pulsarAddress"
:
Params
.
RootCoordCfg
.
Pulsar
Address
,
"pulsarAddress"
:
Params
.
PulsarCfg
.
Address
,
"receiveBufSize"
:
1024
,
"pulsarBufSize"
:
1024
}
err
:=
factory
.
SetParams
(
m
)
...
...
internal/rootcoord/root_coord.go
浏览文件 @
7efb02a4
...
...
@@ -443,8 +443,8 @@ func (c *Core) setDdMsgSendFlag(b bool) error {
}
func
(
c
*
Core
)
setMsgStreams
()
error
{
if
Params
.
RootCoordCfg
.
Pulsar
Address
==
""
{
return
fmt
.
Errorf
(
"pulsar
A
ddress is empty"
)
if
Params
.
PulsarCfg
.
Address
==
""
{
return
fmt
.
Errorf
(
"pulsar
a
ddress is empty"
)
}
if
Params
.
RootCoordCfg
.
MsgChannelSubName
==
""
{
return
fmt
.
Errorf
(
"msgChannelSubName is empty"
)
...
...
@@ -1021,7 +1021,7 @@ func (c *Core) Init() error {
}
m
:=
map
[
string
]
interface
{}{
"PulsarAddress"
:
Params
.
RootCoordCfg
.
Pulsar
Address
,
"PulsarAddress"
:
Params
.
PulsarCfg
.
Address
,
"ReceiveBufSize"
:
1024
,
"PulsarBufSize"
:
1024
}
if
initError
=
c
.
msFactory
.
SetParams
(
m
);
initError
!=
nil
{
...
...
internal/rootcoord/root_coord_test.go
浏览文件 @
7efb02a4
...
...
@@ -619,7 +619,7 @@ func TestRootCoord(t *testing.T) {
tmpFactory
:=
msgstream
.
NewPmsFactory
()
m
:=
map
[
string
]
interface
{}{
"pulsarAddress"
:
Params
.
RootCoordCfg
.
Pulsar
Address
,
"pulsarAddress"
:
Params
.
PulsarCfg
.
Address
,
"receiveBufSize"
:
1024
,
"pulsarBufSize"
:
1024
}
err
=
tmpFactory
.
SetParams
(
m
)
...
...
@@ -2355,7 +2355,7 @@ func TestRootCoord2(t *testing.T) {
m
:=
map
[
string
]
interface
{}{
"receiveBufSize"
:
1024
,
"pulsarAddress"
:
Params
.
RootCoordCfg
.
Pulsar
Address
,
"pulsarAddress"
:
Params
.
PulsarCfg
.
Address
,
"pulsarBufSize"
:
1024
}
err
=
msFactory
.
SetParams
(
m
)
assert
.
Nil
(
t
,
err
)
...
...
@@ -2636,7 +2636,7 @@ func TestCheckFlushedSegments(t *testing.T) {
m
:=
map
[
string
]
interface
{}{
"receiveBufSize"
:
1024
,
"pulsarAddress"
:
Params
.
RootCoordCfg
.
Pulsar
Address
,
"pulsarAddress"
:
Params
.
PulsarCfg
.
Address
,
"pulsarBufSize"
:
1024
}
err
=
msFactory
.
SetParams
(
m
)
assert
.
Nil
(
t
,
err
)
...
...
@@ -2803,7 +2803,7 @@ func TestRootCoord_CheckZeroShardsNum(t *testing.T) {
m
:=
map
[
string
]
interface
{}{
"receiveBufSize"
:
1024
,
"pulsarAddress"
:
Params
.
RootCoordCfg
.
Pulsar
Address
,
"pulsarAddress"
:
Params
.
PulsarCfg
.
Address
,
"pulsarBufSize"
:
1024
}
err
=
msFactory
.
SetParams
(
m
)
assert
.
Nil
(
t
,
err
)
...
...
internal/rootcoord/timestamp_test.go
浏览文件 @
7efb02a4
...
...
@@ -122,7 +122,7 @@ func BenchmarkAllocTimestamp(b *testing.B) {
m
:=
map
[
string
]
interface
{}{
"receiveBufSize"
:
1024
,
"pulsarAddress"
:
Params
.
RootCoordCfg
.
Pulsar
Address
,
"pulsarAddress"
:
Params
.
PulsarCfg
.
Address
,
"pulsarBufSize"
:
1024
}
err
=
msFactory
.
SetParams
(
m
)
assert
.
Nil
(
b
,
err
)
...
...
internal/rootcoord/timeticksync_test.go
浏览文件 @
7efb02a4
...
...
@@ -38,7 +38,7 @@ func TestTimetickSync(t *testing.T) {
factory
:=
msgstream
.
NewPmsFactory
()
m
:=
map
[
string
]
interface
{}{
"pulsarAddress"
:
Params
.
RootCoordCfg
.
Pulsar
Address
,
"pulsarAddress"
:
Params
.
PulsarCfg
.
Address
,
"receiveBufSize"
:
1024
,
"pulsarBufSize"
:
1024
}
err
:=
factory
.
SetParams
(
m
)
...
...
internal/util/paramtable/global_param.go
浏览文件 @
7efb02a4
...
...
@@ -53,6 +53,7 @@ type GlobalParamTable struct {
once
sync
.
Once
BaseParams
BaseParamTable
PulsarCfg
pulsarConfig
//CommonCfg commonConfig
//KnowhereCfg knowhereConfig
//MsgChannelCfg msgChannelConfig
...
...
@@ -78,6 +79,7 @@ func (p *GlobalParamTable) InitOnce() {
func
(
p
*
GlobalParamTable
)
Init
()
{
p
.
BaseParams
.
Init
()
p
.
PulsarCfg
.
init
(
&
p
.
BaseParams
)
//p.CommonCfg.init(&p.BaseParams)
//p.KnowhereCfg.init(&p.BaseParams)
//p.MsgChannelCfg.init(&p.BaseParams)
...
...
@@ -100,6 +102,43 @@ func (p *GlobalParamTable) SetLogConfig(role string) {
// TODO: considering remove it: comment a large block of code is not a good practice, old code can be found with git
///////////////////////////////////////////////////////////////////////////////
// --- pulsar ---
type
pulsarConfig
struct
{
BaseParams
*
BaseParamTable
Address
string
MaxMessageSize
int
}
func
(
p
*
pulsarConfig
)
init
(
bp
*
BaseParamTable
)
{
p
.
BaseParams
=
bp
p
.
initAddress
()
p
.
initMaxMessageSize
()
}
func
(
p
*
pulsarConfig
)
initAddress
()
{
addr
,
err
:=
p
.
BaseParams
.
Load
(
"_PulsarAddress"
)
if
err
!=
nil
{
panic
(
err
)
}
p
.
Address
=
addr
}
func
(
p
*
pulsarConfig
)
initMaxMessageSize
()
{
maxMessageSizeStr
,
err
:=
p
.
BaseParams
.
Load
(
"pulsar.maxMessageSize"
)
if
err
!=
nil
{
p
.
MaxMessageSize
=
SuggestPulsarMaxMessageSize
}
else
{
maxMessageSize
,
err
:=
strconv
.
Atoi
(
maxMessageSizeStr
)
if
err
!=
nil
{
p
.
MaxMessageSize
=
SuggestPulsarMaxMessageSize
}
else
{
p
.
MaxMessageSize
=
maxMessageSize
}
}
}
// --- common ---
//type commonConfig struct {
// BaseParams *BaseParamTable
...
...
@@ -294,8 +333,6 @@ type rootCoordConfig struct {
Address
string
Port
int
PulsarAddress
string
ClusterChannelPrefix
string
MsgChannelSubName
string
TimeTickChannel
string
...
...
@@ -316,8 +353,6 @@ type rootCoordConfig struct {
func
(
p
*
rootCoordConfig
)
init
(
bp
*
BaseParamTable
)
{
p
.
BaseParams
=
bp
p
.
initPulsarAddress
()
// Has to init global msgchannel prefix before other channel names
p
.
initClusterMsgChannelPrefix
()
p
.
initMsgChannelSubName
()
...
...
@@ -333,14 +368,6 @@ func (p *rootCoordConfig) init(bp *BaseParamTable) {
p
.
initDefaultIndexName
()
}
func
(
p
*
rootCoordConfig
)
initPulsarAddress
()
{
addr
,
err
:=
p
.
BaseParams
.
Load
(
"_PulsarAddress"
)
if
err
!=
nil
{
panic
(
err
)
}
p
.
PulsarAddress
=
addr
}
func
(
p
*
rootCoordConfig
)
initClusterMsgChannelPrefix
()
{
config
,
err
:=
p
.
BaseParams
.
Load
(
"msgChannel.chanNamePrefix.cluster"
)
if
err
!=
nil
{
...
...
@@ -429,8 +456,6 @@ type proxyConfig struct {
Alias
string
PulsarAddress
string
RocksmqPath
string
// not used in Proxy
ProxyID
UniqueID
...
...
@@ -456,8 +481,6 @@ type proxyConfig struct {
MaxTaskNum
int64
PulsarMaxMessageSize
int
RetentionDuration
int64
CreatedTime
time
.
Time
...
...
@@ -467,7 +490,6 @@ type proxyConfig struct {
func
(
p
*
proxyConfig
)
init
(
bp
*
BaseParamTable
)
{
p
.
BaseParams
=
bp
p
.
initPulsarAddress
()
p
.
initRocksmqPath
()
p
.
initTimeTickInterval
()
...
...
@@ -483,8 +505,6 @@ func (p *proxyConfig) init(bp *BaseParamTable) {
p
.
initDefaultPartitionName
()
p
.
initDefaultIndexName
()
p
.
initPulsarMaxMessageSize
()
p
.
initMaxTaskNum
()
p
.
initBufFlagExpireTime
()
p
.
initBufFlagCleanupInterval
()
...
...
@@ -501,14 +521,6 @@ func (p *proxyConfig) InitAlias(alias string) {
p
.
Alias
=
alias
}
func
(
p
*
proxyConfig
)
initPulsarAddress
()
{
ret
,
err
:=
p
.
BaseParams
.
Load
(
"_PulsarAddress"
)
if
err
!=
nil
{
panic
(
err
)
}
p
.
PulsarAddress
=
ret
}
func
(
p
*
proxyConfig
)
initRocksmqPath
()
{
path
,
err
:=
p
.
BaseParams
.
Load
(
"_RocksmqPath"
)
if
err
!=
nil
{
...
...
@@ -599,20 +611,6 @@ func (p *proxyConfig) initDefaultIndexName() {
p
.
DefaultIndexName
=
name
}
func
(
p
*
proxyConfig
)
initPulsarMaxMessageSize
()
{
maxMessageSizeStr
,
err
:=
p
.
BaseParams
.
Load
(
"pulsar.maxMessageSize"
)
if
err
!=
nil
{
p
.
PulsarMaxMessageSize
=
SuggestPulsarMaxMessageSize
}
else
{
maxMessageSize
,
err
:=
strconv
.
Atoi
(
maxMessageSizeStr
)
if
err
!=
nil
{
p
.
PulsarMaxMessageSize
=
SuggestPulsarMaxMessageSize
}
else
{
p
.
PulsarMaxMessageSize
=
maxMessageSize
}
}
}
func
(
p
*
proxyConfig
)
initMaxTaskNum
()
{
p
.
MaxTaskNum
=
p
.
BaseParams
.
ParseInt64WithDefault
(
"proxy.maxTaskNum"
,
1024
)
}
...
...
@@ -666,9 +664,6 @@ type queryCoordConfig struct {
DmlChannelPrefix
string
DeltaChannelPrefix
string
// --- Pulsar ---
PulsarAddress
string
//---- Handoff ---
AutoHandoff
bool
...
...
@@ -696,9 +691,6 @@ func (p *queryCoordConfig) init(bp *BaseParamTable) {
p
.
initMinioUseSSLStr
()
p
.
initMinioBucketName
()
//--- Pulsar ----
p
.
initPulsarAddress
()
//---- Handoff ---
p
.
initAutoHandoff
()
...
...
@@ -801,14 +793,6 @@ func (p *queryCoordConfig) initMinioBucketName() {
p
.
MinioBucketName
=
bucketName
}
func
(
p
*
queryCoordConfig
)
initPulsarAddress
()
{
addr
,
err
:=
p
.
BaseParams
.
Load
(
"_PulsarAddress"
)
if
err
!=
nil
{
panic
(
err
)
}
p
.
PulsarAddress
=
addr
}
func
(
p
*
queryCoordConfig
)
initAutoHandoff
()
{
handoff
,
err
:=
p
.
BaseParams
.
Load
(
"queryCoord.autoHandoff"
)
if
err
!=
nil
{
...
...
@@ -879,8 +863,7 @@ func (p *queryCoordConfig) initDeltaChannelName() {
type
queryNodeConfig
struct
{
BaseParams
*
BaseParamTable
PulsarAddress
string
RocksmqPath
string
RocksmqPath
string
Alias
string
QueryNodeIP
string
...
...
@@ -950,7 +933,6 @@ func (p *queryNodeConfig) init(bp *BaseParamTable) {
p
.
initMinioUseSSLStr
()
p
.
initMinioBucketName
()
p
.
initPulsarAddress
()
p
.
initRocksmqPath
()
p
.
initGracefulTime
()
...
...
@@ -1053,14 +1035,6 @@ func (p *queryNodeConfig) initMinioBucketName() {
p
.
MinioBucketName
=
bucketName
}
func
(
p
*
queryNodeConfig
)
initPulsarAddress
()
{
url
,
err
:=
p
.
BaseParams
.
Load
(
"_PulsarAddress"
)
if
err
!=
nil
{
panic
(
err
)
}
p
.
PulsarAddress
=
url
}
func
(
p
*
queryNodeConfig
)
initRocksmqPath
()
{
path
,
err
:=
p
.
BaseParams
.
Load
(
"_RocksmqPath"
)
if
err
!=
nil
{
...
...
@@ -1184,9 +1158,6 @@ type dataCoordConfig struct {
MinioBucketName
string
MinioRootPath
string
// --- Pulsar ---
PulsarAddress
string
// --- Rocksmq ---
RocksmqPath
string
...
...
@@ -1222,7 +1193,6 @@ func (p *dataCoordConfig) init(bp *BaseParamTable) {
p
.
initChannelWatchPrefix
()
p
.
initPulsarAddress
()
p
.
initRocksmqPath
()
p
.
initSegmentMaxSize
()
...
...
@@ -1254,14 +1224,6 @@ func (p *dataCoordConfig) init(bp *BaseParamTable) {
p
.
initGCDropTolerance
()
}
func
(
p
*
dataCoordConfig
)
initPulsarAddress
()
{
addr
,
err
:=
p
.
BaseParams
.
Load
(
"_PulsarAddress"
)
if
err
!=
nil
{
panic
(
err
)
}
p
.
PulsarAddress
=
addr
}
func
(
p
*
dataCoordConfig
)
initRocksmqPath
()
{
path
,
err
:=
p
.
BaseParams
.
Load
(
"_RocksmqPath"
)
if
err
!=
nil
{
...
...
@@ -1436,9 +1398,6 @@ type dataNodeConfig struct {
DmlChannelName
string
DeltaChannelName
string
// Pulsar address
PulsarAddress
string
// Rocksmq path
RocksmqPath
string
...
...
@@ -1475,7 +1434,6 @@ func (p *dataNodeConfig) init(bp *BaseParamTable) {
p
.
initStatsBinlogRootPath
()
p
.
initDeleteBinlogRootPath
()
p
.
initPulsarAddress
()
p
.
initRocksmqPath
()
// Must init global msgchannel prefix before other channel names
...
...
@@ -1542,14 +1500,6 @@ func (p *dataNodeConfig) initDeleteBinlogRootPath() {
p
.
DeleteBinlogRootPath
=
path
.
Join
(
rootPath
,
"delta_log"
)
}
func
(
p
*
dataNodeConfig
)
initPulsarAddress
()
{
url
,
err
:=
p
.
BaseParams
.
Load
(
"_PulsarAddress"
)
if
err
!=
nil
{
panic
(
err
)
}
p
.
PulsarAddress
=
url
}
func
(
p
*
dataNodeConfig
)
initRocksmqPath
()
{
path
,
err
:=
p
.
BaseParams
.
Load
(
"_RocksmqPath"
)
if
err
!=
nil
{
...
...
internal/util/paramtable/global_param_test.go
浏览文件 @
7efb02a4
...
...
@@ -15,7 +15,6 @@ import (
"log"
"os"
"path"
"strings"
"testing"
"time"
...
...
@@ -33,12 +32,18 @@ func TestGlobalParamTable(t *testing.T) {
var
GlobalParams
GlobalParamTable
GlobalParams
.
Init
()
t
.
Run
(
"test pulsarConfig"
,
func
(
t
*
testing
.
T
)
{
Params
:=
GlobalParams
.
PulsarCfg
assert
.
NotEqual
(
t
,
Params
.
Address
,
""
)
t
.
Logf
(
"pulsar address = %s"
,
Params
.
Address
)
assert
.
Equal
(
t
,
Params
.
MaxMessageSize
,
SuggestPulsarMaxMessageSize
)
})
t
.
Run
(
"test rootCoordConfig"
,
func
(
t
*
testing
.
T
)
{
Params
:=
GlobalParams
.
RootCoordCfg
assert
.
NotEqual
(
t
,
Params
.
PulsarAddress
,
""
)
t
.
Logf
(
"pulsar address = %s"
,
Params
.
PulsarAddress
)
assert
.
Equal
(
t
,
Params
.
MsgChannelSubName
,
"by-dev-rootCoord"
)
t
.
Logf
(
"msg channel sub name = %s"
,
Params
.
MsgChannelSubName
)
...
...
@@ -75,8 +80,6 @@ func TestGlobalParamTable(t *testing.T) {
t
.
Run
(
"test proxyConfig"
,
func
(
t
*
testing
.
T
)
{
Params
:=
GlobalParams
.
ProxyCfg
t
.
Logf
(
"PulsarAddress: %s"
,
Params
.
PulsarAddress
)
t
.
Logf
(
"RocksmqPath: %s"
,
Params
.
RocksmqPath
)
t
.
Logf
(
"TimeTickInterval: %v"
,
Params
.
TimeTickInterval
)
...
...
@@ -101,8 +104,6 @@ func TestGlobalParamTable(t *testing.T) {
t
.
Logf
(
"DefaultIndexName: %s"
,
Params
.
DefaultIndexName
)
t
.
Logf
(
"PulsarMaxMessageSize: %d"
,
Params
.
PulsarMaxMessageSize
)
//t.Logf("RoleName: %s", typeutil.ProxyRole)
t
.
Logf
(
"MaxTaskNum: %d"
,
Params
.
MaxTaskNum
)
...
...
@@ -166,11 +167,6 @@ func TestGlobalParamTable(t *testing.T) {
t
.
Run
(
"test queryNodeConfig"
,
func
(
t
*
testing
.
T
)
{
Params
:=
GlobalParams
.
QueryNodeCfg
address
:=
Params
.
PulsarAddress
split
:=
strings
.
Split
(
address
,
":"
)
assert
.
Equal
(
t
,
"pulsar"
,
split
[
0
])
assert
.
Equal
(
t
,
"6650"
,
split
[
len
(
split
)
-
1
])
cacheSize
:=
Params
.
CacheSize
assert
.
Equal
(
t
,
int64
(
32
),
cacheSize
)
err
:=
os
.
Setenv
(
"CACHE_SIZE"
,
"2"
)
...
...
@@ -265,9 +261,6 @@ func TestGlobalParamTable(t *testing.T) {
path1
:=
Params
.
InsertBinlogRootPath
log
.
Println
(
"InsertBinlogRootPath:"
,
path1
)
address
:=
Params
.
PulsarAddress
log
.
Println
(
"PulsarAddress:"
,
address
)
path1
=
Params
.
ClusterChannelPrefix
assert
.
Equal
(
t
,
path1
,
"by-dev"
)
log
.
Println
(
"ClusterChannelPrefix:"
,
Params
.
ClusterChannelPrefix
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录