admin/milvus
1
0
Fork 0
mirror of https://gitee.com/milvus-io/milvus.git synced 2025-12-06 17:18:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Move node.yaml to component.yaml (#11363)

Browse Source 
Signed-off-by: xiaofan-luan <xiaofan.luan@zilliz.com>
This commit is contained in:
Xiaofan 2021-11-10 14:27:37 +08:00 committed by GitHub
parent 124bd6c20a
commit 5f08b67156
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
18 changed files with 154 additions and 327 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
configs/advanced/component.yaml Normal file
View File

@ -0,0 +1,74 @@
# Licensed to the LF AI & Data foundation under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
dataCoord:
segment:
maxSize: 512 # Maximum size of a segment in MB
sealProportion: 0.75 # It's the minimum proportion for a segment which can be sealed
assignmentExpiration: 2000 # ms
enableCompaction: false
dataNode:
dataSync:
flowGraph:
maxQueueLength: 1024 # Maximum length of task queue in flowgraph
maxParallelism: 1024 # Maximum number of tasks executed in parallel in the flowgraph
flush:
# Max buffer size to flush for a single segment.
insertBufSize: 16777216 # Bytes, 16 MB
proxy:
timeTickInterval: 200 # ms, the interval that proxy synchronize the time tick
msgStream:
insert:
bufSize: 1024 # msgPack chan buffer size
search:
bufSize: 512
searchResult:
recvBufSize: 1024 # msgPack chan buffer size
pulsarBufSize: 1024 # pulsar chan buffer size
timeTick:
bufSize: 512
maxNameLength: 255 # max name length of collection or alias
maxFieldNum: 64 # max field number of a collection
maxDimension: 32768 # Maximum dimension of vector
maxShardNum: 256 # Maximum number of shards in a collection
maxTaskNum: 1024 # max task number of proxy task queue
queryNode:
stats:
publishInterval: 1000 # Interval for querynode to report node information (milliseconds)
dataSync:
flowGraph:
maxQueueLength: 1024 # Maximum length of task queue in flowgraph
maxParallelism: 1024 # Maximum number of tasks executed in parallel in the flowgraph
msgStream:
search:
recvBufSize: 512 # msgPack channel buffer size
pulsarBufSize: 512 # pulsar channel buffer size
searchResult:
recvBufSize: 64 # msgPack channel buffer size
# Segcore will divide a segment into multiple chunks.
segcore:
chunkRows: 32768 # The number of vectors in a chunk.
rootcoord:
dmlChannelNum: 256 # The number of dml channels created at system startup
maxPartitionNum: 4096 # Maximum number of partitions in a collection
minSegmentSizeToEnableIndex: 1024 # It's a threshold. When the segment size is less than this value, the segment will not be indexed
timeout: 3600 # time out, 5 seconds
timeTickInterval: 200 # ms, the interval that proxy synchronize the time tick

23
configs/advanced/data_coord.yaml
View File

@ -1,23 +0,0 @@
# Licensed to the LF AI & Data foundation under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
dataCoord:
segment:
maxSize: 512 # Maximum size of a segment in MB
sealProportion: 0.75 # It's the minimum proportion for a segment which can be sealed
assignmentExpiration: 2000 # ms
enableCompaction: false

26
configs/advanced/data_node.yaml
View File

@ -1,26 +0,0 @@
# Licensed to the LF AI & Data foundation under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
dataNode:
dataSync:
flowGraph:
maxQueueLength: 1024 # Maximum length of task queue in flowgraph
maxParallelism: 1024 # Maximum number of tasks executed in parallel in the flowgraph
flush:
# Max buffer size to flush for a single segment.
insertBufSize: 16777216 # Bytes, 16 MB

39
configs/advanced/proxy.yaml
View File

@ -1,39 +0,0 @@
# Licensed to the LF AI & Data foundation under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
proxy:
timeTickInterval: 200 # ms, the interval that proxy synchronize the time tick
msgStream:
insert:
bufSize: 1024 # msgPack chan buffer size
search:
bufSize: 512
searchResult:
recvBufSize: 1024 # msgPack chan buffer size
pulsarBufSize: 1024 # pulsar chan buffer size
timeTick:
bufSize: 512
maxNameLength: 255 # max name length of collection or alias
maxFieldNum: 64 # max field number of a collection
maxDimension: 32768 # Maximum dimension of vector
maxShardNum: 256 # Maximum number of shards in a collection
maxTaskNum: 1024 # max task number of proxy task queue

36
configs/advanced/query_node.yaml
View File

@ -1,36 +0,0 @@
# Licensed to the LF AI & Data foundation under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
queryNode:
stats:
publishInterval: 1000 # Interval for querynode to report node information (milliseconds)
dataSync:
flowGraph:
maxQueueLength: 1024 # Maximum length of task queue in flowgraph
maxParallelism: 1024 # Maximum number of tasks executed in parallel in the flowgraph
msgStream:
search:
recvBufSize: 512 # msgPack channel buffer size
pulsarBufSize: 512 # pulsar channel buffer size
searchResult:
recvBufSize: 64 # msgPack channel buffer size
# Segcore will divide a segment into multiple chunks.
segcore:
chunkRows: 32768 # The number of vectors in a chunk.

23
configs/advanced/root_coord.yaml
View File

@ -1,23 +0,0 @@
# Licensed to the LF AI & Data foundation under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
rootcoord:
dmlChannelNum: 256 # The number of dml channels created at system startup
maxPartitionNum: 4096 # Maximum number of partitions in a collection
minSegmentSizeToEnableIndex: 1024 # It's a threshold. When the segment size is less than this value, the segment will not be indexed
timeout: 3600 # time out, 5 seconds
timeTickInterval: 200 # ms, the interval that proxy synchronize the time tick

4
internal/datacoord/param_table.go
View File

@ -80,10 +80,6 @@ func (p *ParamTable) Init() {
// load yaml
p.BaseTable.Init()
if err := p.LoadYaml("advanced/data_coord.yaml"); err != nil {
panic(err)
}
// set members
p.initEtcdEndpoints()
p.initMetaRootPath()

8
internal/datanode/param_table.go
View File

@ -104,10 +104,6 @@ func (p *ParamTable) InitOnce() {
// Init initializes DataNode configs
func (p *ParamTable) Init() {
p.BaseTable.Init()
err := p.LoadYaml("advanced/data_node.yaml")
if err != nil {
panic(err)
}
p.initFlowGraphMaxQueueLength()
p.initFlowGraphMaxParallelism()
@ -141,11 +137,11 @@ func (p *ParamTable) Init() {
}
func (p *ParamTable) initFlowGraphMaxQueueLength() {
p.FlowGraphMaxQueueLength = p.ParseInt32("dataNode.dataSync.flowGraph.maxQueueLength")
p.FlowGraphMaxQueueLength = p.ParseInt32WithDefault("dataNode.dataSync.flowGraph.maxQueueLength", 1024)
}
func (p *ParamTable) initFlowGraphMaxParallelism() {
p.FlowGraphMaxParallelism = p.ParseInt32("dataNode.dataSync.flowGraph.maxParallelism")
p.FlowGraphMaxParallelism = p.ParseInt32WithDefault("dataNode.dataSync.flowGraph.maxParallelism", 1024)
}
func (p *ParamTable) initFlushInsertBufferSize() {

4
internal/distributed/rootcoord/param_table.go
View File

@ -52,10 +52,6 @@ type ParamTable struct {
func (p *ParamTable) Init() {
once.Do(func() {
p.BaseTable.Init()
err := p.LoadYaml("advanced/root_coord.yaml")
if err != nil {
panic(err)
}
p.initAddress()
p.initPort()
p.initIndexCoordAddress()

5
internal/indexcoord/param_table.go
View File

@ -55,11 +55,6 @@ var once sync.Once
// Init is used to initialize configuration items.
func (pt *ParamTable) Init() {
pt.BaseTable.Init()
// TODO, load index_node.yaml
/*err := pt.LoadYaml("advanced/index_coord.yaml")
if err != nil {
panic(err)
}*/
pt.initEtcdEndpoints()
pt.initMetaRootPath()

5
internal/indexnode/param_table.go
View File

@ -68,11 +68,6 @@ func (pt *ParamTable) InitAlias(alias string) {
// Init is used to initialize configuration items.
func (pt *ParamTable) Init() {
pt.BaseTable.Init()
// TODO, load index_node.yaml
/*err := pt.LoadYaml("advanced/index_node.yaml")
if err != nil {
panic(err)
}*/
pt.initParams()
}

46
internal/proxy/param_table.go
View File

@ -88,11 +88,6 @@ func (pt *ParamTable) InitOnce() {
// Init of BaseTable and do some other initialization.
func (pt *ParamTable) Init() {
pt.BaseTable.Init()
err := pt.LoadYaml("advanced/proxy.yaml")
if err != nil {
panic(err)
}
pt.initEtcdEndpoints()
pt.initMetaRootPath()
pt.initPulsarAddress()
@ -139,14 +134,7 @@ func (pt *ParamTable) initRocksmqPath() {
}
func (pt *ParamTable) initTimeTickInterval() {
intervalStr, err := pt.Load("proxy.timeTickInterval")
if err != nil {
panic(err)
}
interval, err := strconv.Atoi(intervalStr)
if err != nil {
panic(err)
}
interval := pt.ParseIntWithDefault("proxy.timeTickInterval", 200)
pt.TimeTickInterval = time.Duration(interval) * time.Millisecond
}
@ -178,14 +166,11 @@ func (pt *ParamTable) initProxyTimeTickChannelNames() {
}
func (pt *ParamTable) initMsgStreamTimeTickBufSize() {
pt.MsgStreamTimeTickBufSize = pt.ParseInt64("proxy.msgStream.timeTick.bufSize")
pt.MsgStreamTimeTickBufSize = pt.ParseInt64WithDefault("proxy.msgStream.timeTick.bufSize", 512)
}
func (pt *ParamTable) initMaxNameLength() {
str, err := pt.Load("proxy.maxNameLength")
if err != nil {
panic(err)
}
str := pt.LoadWithDefault("proxy.maxNameLength", "255")
maxNameLength, err := strconv.ParseInt(str, 10, 64)
if err != nil {
panic(err)
@ -194,10 +179,7 @@ func (pt *ParamTable) initMaxNameLength() {
}
func (pt *ParamTable) initMaxShardNum() {
str, err := pt.Load("proxy.maxShardNum")
if err != nil {
panic(err)
}
str := pt.LoadWithDefault("proxy.maxShardNum", "256")
maxShardNum, err := strconv.ParseInt(str, 10, 64)
if err != nil {
panic(err)
@ -206,10 +188,7 @@ func (pt *ParamTable) initMaxShardNum() {
}
func (pt *ParamTable) initMaxFieldNum() {
str, err := pt.Load("proxy.maxFieldNum")
if err != nil {
panic(err)
}
str := pt.LoadWithDefault("proxy.maxFieldNum", "64")
maxFieldNum, err := strconv.ParseInt(str, 10, 64)
if err != nil {
panic(err)
@ -218,10 +197,7 @@ func (pt *ParamTable) initMaxFieldNum() {
}
func (pt *ParamTable) initMaxDimension() {
str, err := pt.Load("proxy.maxDimension")
if err != nil {
panic(err)
}
str := pt.LoadWithDefault("proxy.maxDimension", "32768")
maxDimension, err := strconv.ParseInt(str, 10, 64)
if err != nil {
panic(err)
@ -306,13 +282,5 @@ func (pt *ParamTable) initMetaRootPath() {
}
func (pt *ParamTable) initMaxTaskNum() {
str, err := pt.Load("proxy.maxTaskNum")
if err != nil {
panic(err)
}
maxTaskNum, err := strconv.ParseInt(str, 10, 64)
if err != nil {
panic(err)
}
pt.MaxTaskNum = maxTaskNum
pt.MaxTaskNum = pt.ParseInt64WithDefault("proxy.maxTaskNum", 1024)
}

35
internal/proxy/param_table_test.go
View File

@ -98,71 +98,36 @@ func shouldPanic(t *testing.T, name string, f func()) {
}
func TestParamTable_Panics(t *testing.T) {
shouldPanic(t, "proxy.timeTickInterval", func() {
Params.Remove("proxy.timeTickInterval")
Params.initTimeTickInterval()
})
shouldPanic(t, "proxy.timeTickInterval", func() {
Params.Save("proxy.timeTickInterval", "")
Params.initTimeTickInterval()
})
shouldPanic(t, "proxy.msgStream.timeTick.bufSize", func() {
Params.Remove("proxy.msgStream.timeTick.bufSize")
Params.initMsgStreamTimeTickBufSize()
})
shouldPanic(t, "proxy.msgStream.timeTick.bufSize", func() {
Params.Save("proxy.msgStream.timeTick.bufSize", "abc")
Params.initMsgStreamTimeTickBufSize()
})
shouldPanic(t, "proxy.maxNameLength", func() {
Params.Remove("proxy.maxNameLength")
Params.initMaxNameLength()
})
shouldPanic(t, "proxy.maxNameLength", func() {
Params.Save("proxy.maxNameLength", "abc")
Params.initMaxNameLength()
})
shouldPanic(t, "proxy.maxFieldNum", func() {
Params.Remove("proxy.maxFieldNum")
Params.initMaxFieldNum()
})
shouldPanic(t, "proxy.maxFieldNum", func() {
Params.Save("proxy.maxFieldNum", "abc")
Params.initMaxFieldNum()
})
shouldPanic(t, "proxy.maxShardNum", func() {
Params.Remove("proxy.maxShardNum")
Params.initMaxShardNum()
})
shouldPanic(t, "proxy.maxShardNum", func() {
Params.Save("proxy.maxShardNum", "abc")
Params.initMaxShardNum()
})
shouldPanic(t, "proxy.maxDimension", func() {
Params.Remove("proxy.maxDimension")
Params.initMaxDimension()
})
shouldPanic(t, "proxy.maxDimension", func() {
Params.Save("proxy.maxDimension", "-asdf")
Params.initMaxDimension()
})
shouldPanic(t, "proxy.maxTaskNum", func() {
Params.Remove("proxy.maxTaskNum")
Params.initMaxTaskNum()
})
shouldPanic(t, "proxy.maxTaskNum", func() {
Params.Save("proxy.maxTaskNum", "-asdf")
Params.initMaxTaskNum()

9
internal/querycoord/param_table.go
View File

@ -86,15 +86,6 @@ func (p *ParamTable) InitOnce() {
//Init is used to initialize params
func (p *ParamTable) Init() {
p.BaseTable.Init()
err := p.LoadYaml("advanced/query_node.yaml")
if err != nil {
panic(err)
}
err = p.LoadYaml("milvus.yaml")
if err != nil {
panic(err)
}
p.initQueryCoordAddress()
p.initRoleName()

17
internal/querynode/param_table.go
View File

@ -108,9 +108,6 @@ func (p *ParamTable) InitOnce() {
// Init is used to initialize configuration items.
func (p *ParamTable) Init() {
p.BaseTable.Init()
if err := p.LoadYaml("advanced/query_node.yaml"); err != nil {
panic(err)
}
p.initCacheSize()
p.initInContainer()
@ -245,29 +242,29 @@ func (p *ParamTable) initRocksmqPath() {
// advanced params
// stats
func (p *ParamTable) initStatsPublishInterval() {
p.StatsPublishInterval = p.ParseInt("queryNode.stats.publishInterval")
p.StatsPublishInterval = p.ParseIntWithDefault("queryNode.stats.publishInterval", 1000)
}
// dataSync:
func (p *ParamTable) initFlowGraphMaxQueueLength() {
p.FlowGraphMaxQueueLength = p.ParseInt32("queryNode.dataSync.flowGraph.maxQueueLength")
p.FlowGraphMaxQueueLength = p.ParseInt32WithDefault("queryNode.dataSync.flowGraph.maxQueueLength", 1024)
}
func (p *ParamTable) initFlowGraphMaxParallelism() {
p.FlowGraphMaxParallelism = p.ParseInt32("queryNode.dataSync.flowGraph.maxParallelism")
p.FlowGraphMaxParallelism = p.ParseInt32WithDefault("queryNode.dataSync.flowGraph.maxParallelism", 1024)
}
// msgStream
func (p *ParamTable) initSearchReceiveBufSize() {
p.SearchReceiveBufSize = p.ParseInt64("queryNode.msgStream.search.recvBufSize")
p.SearchReceiveBufSize = p.ParseInt64WithDefault("queryNode.msgStream.search.recvBufSize", 512)
}
func (p *ParamTable) initSearchPulsarBufSize() {
p.SearchPulsarBufSize = p.ParseInt64("queryNode.msgStream.search.pulsarBufSize")
p.SearchPulsarBufSize = p.ParseInt64WithDefault("queryNode.msgStream.search.pulsarBufSize", 512)
}
func (p *ParamTable) initSearchResultReceiveBufSize() {
p.SearchResultReceiveBufSize = p.ParseInt64("queryNode.msgStream.searchResult.recvBufSize")
p.SearchResultReceiveBufSize = p.ParseInt64WithDefault("queryNode.msgStream.searchResult.recvBufSize", 64)
}
// ------------------------ channel names
@ -333,7 +330,7 @@ func (p *ParamTable) initGracefulTime() {
}
func (p *ParamTable) initSegcoreChunkRows() {
p.ChunkRows = p.ParseInt64("queryNode.segcore.chunkRows")
p.ChunkRows = p.ParseInt64WithDefault("queryNode.segcore.chunkRows", 32768)
}
func (p *ParamTable) initKnowhereSimdType() {

4
internal/rootcoord/param_table.go
View File

@ -66,10 +66,6 @@ func (p *ParamTable) InitOnce() {
func (p *ParamTable) Init() {
// load yaml
p.BaseTable.Init()
err := p.LoadYaml("advanced/root_coord.yaml")
if err != nil {
panic(err)
}
p.initPulsarAddress()
p.initEtcdEndpoints()

101
internal/util/paramtable/basetable.go
View File

@ -33,6 +33,8 @@ import (
// UniqueID is type alias of typeutil.UniqueID
type UniqueID = typeutil.UniqueID
const envPrefix string = "milvus"
type Base interface {
Load(key string) (string, error)
LoadRange(key, endKey string, limit int) ([]string, []string, error)
@ -61,6 +63,8 @@ func (gp *BaseTable) Init() {
gp.loadFromMilvusYaml()
gp.loadFromComponentYaml()
gp.tryloadFromEnv()
gp.InitLogCfg()
@ -104,6 +108,18 @@ func (gp *BaseTable) loadFromMilvusYaml() {
}
}
func (gp *BaseTable) loadFromComponentYaml() bool {
configFile := gp.configDir + "advanced/component.yaml"
if _, err := os.Stat(configFile); err == nil {
if err := gp.LoadYaml("advanced/component.yaml"); err != nil {
panic(err)
}
return true
}
log.Debug("failed to find component.yaml in config, skip..")
return false
}
func (gp *BaseTable) loadFromCommonYaml() bool {
configFile := gp.configDir + "advanced/common.yaml"
if _, err := os.Stat(configFile); err == nil {
@ -117,6 +133,7 @@ func (gp *BaseTable) loadFromCommonYaml() bool {
}
func (gp *BaseTable) tryloadFromEnv() {
var err error
minioAddress := os.Getenv("MINIO_ADDRESS")
if minioAddress == "" {
minioHost, err := gp.Load("minio.address")
@ -129,10 +146,7 @@ func (gp *BaseTable) tryloadFromEnv() {
}
minioAddress = minioHost + ":" + port
}
err := gp.Save("_MinioAddress", minioAddress)
if err != nil {
panic(err)
}
gp.Save("_MinioAddress", minioAddress)
etcdEndpoints := os.Getenv("ETCD_ENDPOINTS")
if etcdEndpoints == "" {
@ -141,10 +155,7 @@ func (gp *BaseTable) tryloadFromEnv() {
panic(err)
}
}
err = gp.Save("_EtcdEndpoints", etcdEndpoints)
if err != nil {
panic(err)
}
gp.Save("_EtcdEndpoints", etcdEndpoints)
pulsarAddress := os.Getenv("PULSAR_ADDRESS")
if pulsarAddress == "" {
@ -158,10 +169,7 @@ func (gp *BaseTable) tryloadFromEnv() {
}
pulsarAddress = "pulsar://" + pulsarHost + ":" + port
}
err = gp.Save("_PulsarAddress", pulsarAddress)
if err != nil {
panic(err)
}
gp.Save("_PulsarAddress", pulsarAddress)
rocksmqPath := os.Getenv("ROCKSMQ_PATH")
if rocksmqPath == "" {
@ -171,10 +179,7 @@ func (gp *BaseTable) tryloadFromEnv() {
}
rocksmqPath = path
}
err = gp.Save("_RocksmqPath", rocksmqPath)
if err != nil {
panic(err)
}
gp.Save("_RocksmqPath", rocksmqPath)
rootCoordAddress := os.Getenv("ROOT_COORD_ADDRESS")
if rootCoordAddress == "" {
@ -188,10 +193,7 @@ func (gp *BaseTable) tryloadFromEnv() {
}
rootCoordAddress = rootCoordHost + ":" + port
}
err = gp.Save("_RootCoordAddress", rootCoordAddress)
if err != nil {
panic(err)
}
gp.Save("_RootCoordAddress", rootCoordAddress)
indexCoordAddress := os.Getenv("INDEX_COORD_ADDRESS")
if indexCoordAddress == "" {
@ -205,10 +207,7 @@ func (gp *BaseTable) tryloadFromEnv() {
}
indexCoordAddress = indexCoordHost + ":" + port
}
err = gp.Save("_IndexCoordAddress", indexCoordAddress)
if err != nil {
panic(err)
}
gp.Save("_IndexCoordAddress", indexCoordAddress)
queryCoordAddress := os.Getenv("QUERY_COORD_ADDRESS")
if queryCoordAddress == "" {
@ -222,10 +221,7 @@ func (gp *BaseTable) tryloadFromEnv() {
}
queryCoordAddress = serviceHost + ":" + port
}
err = gp.Save("_QueryCoordAddress", queryCoordAddress)
if err != nil {
panic(err)
}
gp.Save("_QueryCoordAddress", queryCoordAddress)
dataCoordAddress := os.Getenv("DATA_COORD_ADDRESS")
if dataCoordAddress == "" {
@ -239,26 +235,13 @@ func (gp *BaseTable) tryloadFromEnv() {
}
dataCoordAddress = serviceHost + ":" + port
}
err = gp.Save("_DataCoordAddress", dataCoordAddress)
if err != nil {
panic(err)
}
gp.Save("_DataCoordAddress", dataCoordAddress)
insertBufferFlushSize := os.Getenv("DATA_NODE_IBUFSIZE")
if insertBufferFlushSize == "" {
//var err error
insertBufferFlushSize, err = gp.Load("datanode.flush.insertBufSize")
if err != nil {
panic(err)
}
}
if insertBufferFlushSize == "" {
insertBufferFlushSize = "16777216" //use default
}
err = gp.Save("_DATANODE_INSERTBUFSIZE", insertBufferFlushSize)
if err != nil {
panic(err)
insertBufferFlushSize = gp.LoadWithDefault("datanode.flush.insertBufSize", "16777216")
}
gp.Save("_DATANODE_INSERTBUFSIZE", insertBufferFlushSize)
minioAccessKey := os.Getenv("MINIO_ACCESS_KEY")
if minioAccessKey == "" {
@ -267,10 +250,7 @@ func (gp *BaseTable) tryloadFromEnv() {
panic(err)
}
}
err = gp.Save("_MinioAccessKeyID", minioAccessKey)
if err != nil {
panic(err)
}
gp.Save("_MinioAccessKeyID", minioAccessKey)
minioSecretKey := os.Getenv("MINIO_SECRET_KEY")
if minioSecretKey == "" {
@ -279,10 +259,7 @@ func (gp *BaseTable) tryloadFromEnv() {
panic(err)
}
}
err = gp.Save("_MinioSecretAccessKey", minioSecretKey)
if err != nil {
panic(err)
}
gp.Save("_MinioSecretAccessKey", minioSecretKey)
minioUseSSL := os.Getenv("MINIO_USE_SSL")
if minioUseSSL == "" {
@ -291,10 +268,7 @@ func (gp *BaseTable) tryloadFromEnv() {
panic(err)
}
}
err = gp.Save("_MinioUseSSL", minioUseSSL)
if err != nil {
panic(err)
}
gp.Save("_MinioUseSSL", minioUseSSL)
minioBucketName := os.Getenv("MINIO_BUCKET_NAME")
if minioBucketName == "" {
@ -303,9 +277,18 @@ func (gp *BaseTable) tryloadFromEnv() {
panic(err)
}
}
err = gp.Save("_MinioBucketName", minioBucketName)
if err != nil {
panic(err)
gp.Save("_MinioBucketName", minioBucketName)
// try to load environment start with ENV_PREFIX
for _, e := range os.Environ() {
parts := strings.SplitN(e, "=", 2)
if strings.Contains(parts[0], envPrefix) {
parts := strings.SplitN(e, "=", 2)
// remove the ENV PREFIX and use the rest as key
keyParts := strings.SplitAfterN(parts[0], ".", 2)
// mem kv throw no errors
gp.Save(keyParts[1], parts[1])
}
}
}

22
internal/util/paramtable/basetable_test.go
View File

@ -156,6 +156,28 @@ func TestBateTable_ConfPath(t *testing.T) {
assert.Equal(t, filepath.Clean(config), filepath.Clean(dir+"/../../../configs/"))
}
func TestBaseTable_Env(t *testing.T) {
os.Setenv("milvus.test", "test")
os.Setenv("milvus.test.test2", "test2")
baseParams.Init()
result, _ := baseParams.Load("test")
assert.Equal(t, result, "test")
result, _ = baseParams.Load("test.test2")
assert.Equal(t, result, "test2")
err := os.Setenv("milvus.invalid=xxx", "test")
assert.Error(t, err)
err = os.Setenv("milvus.invalid", "xxx=test")
assert.NoError(t, err)
baseParams.Init()
result, _ = baseParams.Load("invalid")
assert.Equal(t, result, "xxx=test")
}
func TestBaseTable_Parse(t *testing.T) {
t.Run("ParseBool", func(t *testing.T) {
assert.Nil(t, baseParams.Save("key", "true"))