admin/milvus
1
0
Fork 0
mirror of https://gitee.com/milvus-io/milvus.git synced 2026-01-07 19:31:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix msg channel prefix config priority for backward compatibility (#21871)

Browse Source 
Signed-off-by: Congqi Xia <congqi.xia@zilliz.com>
This commit is contained in:
congqixia 2023-01-31 10:09:51 +08:00 committed by GitHub
parent aa84124d24
commit 8af2aebb66
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
internal/util/paramtable/component_param.go
View File

@ -210,9 +210,9 @@ type commonConfig struct {
func (p *commonConfig) init(base *BaseTable) {
// must init cluster prefix first
p.ClusterPrefix = ParamItem{
Key: "common.chanNamePrefix.cluster",
Key: "msgChannel.chanNamePrefix.cluster",
Version: "2.1.0",
FallbackKeys: []string{"msgChannel.chanNamePrefix.cluster"},
FallbackKeys: []string{"common.chanNamePrefix.cluster"},
PanicIfEmpty: true,
}
p.ClusterPrefix.Init(base.mgr)
@ -221,9 +221,9 @@ func (p *commonConfig) init(base *BaseTable) {
return strings.Join([]string{p.ClusterPrefix.GetValue(), prefix}, "-")
}
p.ProxySubName = ParamItem{
Key: "common.subNamePrefix.proxySubNamePrefix",
Key: "msgChannel.subNamePrefix.proxySubNamePrefix",
Version: "2.1.0",
FallbackKeys: []string{"msgChannel.subNamePrefix.proxySubNamePrefix"},
FallbackKeys: []string{"common.subNamePrefix.proxySubNamePrefix"},
PanicIfEmpty: true,
Formatter: chanNamePrefix,
}
@ -231,27 +231,27 @@ func (p *commonConfig) init(base *BaseTable) {
// --- rootcoord ---
p.RootCoordTimeTick = ParamItem{
Key: "common.chanNamePrefix.rootCoordTimeTick",
Key: "msgChannel.chanNamePrefix.rootCoordTimeTick",
Version: "2.1.0",
FallbackKeys: []string{"msgChannel.chanNamePrefix.rootCoordTimeTick"},
FallbackKeys: []string{"common.chanNamePrefix.rootCoordTimeTick"},
PanicIfEmpty: true,
Formatter: chanNamePrefix,
}
p.RootCoordTimeTick.Init(base.mgr)
p.RootCoordStatistics = ParamItem{
Key: "common.chanNamePrefix.rootCoordStatistics",
Key: "msgChannel.chanNamePrefix.rootCoordStatistics",
Version: "2.1.0",
FallbackKeys: []string{"msgChannel.chanNamePrefix.rootCoordStatistics"},
FallbackKeys: []string{"common.chanNamePrefix.rootCoordStatistics"},
PanicIfEmpty: true,
Formatter: chanNamePrefix,
}
p.RootCoordStatistics.Init(base.mgr)
p.RootCoordDml = ParamItem{
Key: "common.chanNamePrefix.rootCoordDml",
Key: "msgChannel.chanNamePrefix.rootCoordDml",
Version: "2.1.0",
FallbackKeys: []string{"msgChannel.chanNamePrefix.rootCoordDml"},
FallbackKeys: []string{"common.chanNamePrefix.rootCoordDml"},
PanicIfEmpty: true,
Formatter: chanNamePrefix,
Doc: "It is not refreshable currently",
@ -259,9 +259,9 @@ func (p *commonConfig) init(base *BaseTable) {
p.RootCoordDml.Init(base.mgr)
p.RootCoordDelta = ParamItem{
Key: "common.chanNamePrefix.rootCoordDelta",
Key: "msgChannel.chanNamePrefix.rootCoordDelta",
Version: "2.1.0",
FallbackKeys: []string{"msgChannel.chanNamePrefix.rootCoordDelta"},
FallbackKeys: []string{"common.chanNamePrefix.rootCoordDelta"},
PanicIfEmpty: true,
Formatter: chanNamePrefix,
Doc: "It is not refreshable currently",
@ -269,9 +269,9 @@ func (p *commonConfig) init(base *BaseTable) {
p.RootCoordDelta.Init(base.mgr)
p.RootCoordSubName = ParamItem{
Key: "common.subNamePrefix.rootCoordSubNamePrefix",
Key: "msgChannel.subNamePrefix.rootCoordSubNamePrefix",
Version: "2.1.0",
FallbackKeys: []string{"msgChannel.subNamePrefix.rootCoordSubNamePrefix"},
FallbackKeys: []string{"common.subNamePrefix.rootCoordSubNamePrefix"},
PanicIfEmpty: true,
Formatter: chanNamePrefix,
Doc: "It is deprecated",
@ -279,9 +279,9 @@ func (p *commonConfig) init(base *BaseTable) {
p.RootCoordSubName.Init(base.mgr)
p.QueryCoordSearch = ParamItem{
Key: "common.chanNamePrefix.search",
Key: "msgChannel.chanNamePrefix.search",
Version: "2.1.0",
FallbackKeys: []string{"msgChannel.chanNamePrefix.search"},
FallbackKeys: []string{"common.chanNamePrefix.search"},
PanicIfEmpty: true,
Formatter: chanNamePrefix,
Doc: "It is deprecated",
@ -289,9 +289,9 @@ func (p *commonConfig) init(base *BaseTable) {
p.QueryCoordSearch.Init(base.mgr)
p.QueryCoordSearchResult = ParamItem{
Key: "common.chanNamePrefix.searchResult",
Key: "msgChannel.chanNamePrefix.searchResult",
Version: "2.1.0",
FallbackKeys: []string{"msgChannel.chanNamePrefix.searchResult"},
FallbackKeys: []string{"common.chanNamePrefix.searchResult"},
PanicIfEmpty: true,
Formatter: chanNamePrefix,
Doc: "It is deprecated",
@ -299,61 +299,61 @@ func (p *commonConfig) init(base *BaseTable) {
p.QueryCoordSearchResult.Init(base.mgr)
p.QueryCoordTimeTick = ParamItem{
Key: "common.chanNamePrefix.queryTimeTick",
Key: "msgChannel.chanNamePrefix.queryTimeTick",
Version: "2.1.0",
FallbackKeys: []string{"msgChannel.chanNamePrefix.queryTimeTick"},
FallbackKeys: []string{"common.chanNamePrefix.queryTimeTick"},
PanicIfEmpty: true,
Formatter: chanNamePrefix,
}
p.QueryCoordTimeTick.Init(base.mgr)
p.QueryNodeSubName = ParamItem{
Key: "common.subNamePrefix.queryNodeSubNamePrefix",
Key: "msgChannel.subNamePrefix.queryNodeSubNamePrefix",
Version: "2.1.0",
FallbackKeys: []string{"msgChannel.subNamePrefix.queryNodeSubNamePrefix"},
FallbackKeys: []string{"common.subNamePrefix.queryNodeSubNamePrefix"},
PanicIfEmpty: true,
Formatter: chanNamePrefix,
}
p.QueryNodeSubName.Init(base.mgr)
p.DataCoordStatistic = ParamItem{
Key: "common.chanNamePrefix.dataCoordStatistic",
Key: "msgChannel.chanNamePrefix.dataCoordStatistic",
Version: "2.1.0",
FallbackKeys: []string{"msgChannel.chanNamePrefix.dataCoordStatistic"},
FallbackKeys: []string{"common.chanNamePrefix.dataCoordStatistic"},
PanicIfEmpty: true,
Formatter: chanNamePrefix,
}
p.DataCoordStatistic.Init(base.mgr)
p.DataCoordTimeTick = ParamItem{
Key: "common.chanNamePrefix.dataCoordTimeTick",
Key: "msgChannel.chanNamePrefix.dataCoordTimeTick",
Version: "2.1.0",
FallbackKeys: []string{"msgChannel.chanNamePrefix.dataCoordTimeTick"},
FallbackKeys: []string{"common.chanNamePrefix.dataCoordTimeTick"},
PanicIfEmpty: true,
Formatter: chanNamePrefix,
}
p.DataCoordTimeTick.Init(base.mgr)
p.DataCoordSegmentInfo = ParamItem{
Key: "common.chanNamePrefix.dataCoordSegmentInfo",
Key: "msgChannel.chanNamePrefix.dataCoordSegmentInfo",
Version: "2.1.0",
FallbackKeys: []string{"msgChannel.chanNamePrefix.dataCoordSegmentInfo"},
FallbackKeys: []string{"common.chanNamePrefix.dataCoordSegmentInfo"},
PanicIfEmpty: true,
Formatter: chanNamePrefix,
}
p.DataCoordSegmentInfo.Init(base.mgr)
p.DataCoordSubName = ParamItem{
Key: "common.subNamePrefix.dataCoordSubNamePrefix",
Key: "msgChannel.subNamePrefix.dataCoordSubNamePrefix",
Version: "2.1.0",
FallbackKeys: []string{"msgChannel.subNamePrefix.dataCoordSubNamePrefix"},
FallbackKeys: []string{"common.subNamePrefix.dataCoordSubNamePrefix"},
PanicIfEmpty: true,
Formatter: chanNamePrefix,
}
p.DataCoordSubName.Init(base.mgr)
p.DataCoordWatchSubPath = ParamItem{
Key: "common.subNamePrefix.dataCoordWatchSubPath",
Key: "msgChannel.subNamePrefix.dataCoordWatchSubPath",
Version: "2.1.0",
DefaultValue: "channelwatch",
PanicIfEmpty: true,
@ -361,9 +361,9 @@ func (p *commonConfig) init(base *BaseTable) {
p.DataCoordWatchSubPath.Init(base.mgr)
p.DataNodeSubName = ParamItem{
Key: "common.subNamePrefix.dataNodeSubNamePrefix",
Key: "msgChannel.subNamePrefix.dataNodeSubNamePrefix",
Version: "2.1.0",
FallbackKeys: []string{"msgChannel.subNamePrefix.dataNodeSubNamePrefix"},
FallbackKeys: []string{"common.subNamePrefix.dataNodeSubNamePrefix"},
PanicIfEmpty: true,
Formatter: chanNamePrefix,
}