milvus-io
/
milvus
mirror of https://github.com/milvus-io/milvus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

enhance: support merge multi yaml files (#30910) 

related with: #22556

Signed-off-by: lixinguo <xinguo.li@zilliz.com>
Co-authored-by: lixinguo <xinguo.li@zilliz.com>
pull/31325/head
smellthemoon 2024-03-15 21:35:04 +08:00 committed by GitHub
parent 6f39e35721
commit 6055a89713
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pkg/util/paramtable/base_table.go
View File

@ -19,7 +19,6 @@ import (
"sync"
"time"
"github.com/samber/lo"
"go.uber.org/zap"
config "github.com/milvus-io/milvus/pkg/config"
@ -60,7 +59,9 @@ func globalConfigPrefixs() []string {
return []string{"metastore", "localStorage", "etcd", "tikv", "minio", "pulsar", "kafka", "rocksmq", "log", "grpc", "common", "quotaAndLimits"}
}
var defaultYaml = []string{"milvus.yaml"}
// support read "milvus.yaml", "default.yaml", "user.yaml" as this order.
// order: milvus.yaml < default.yaml < user.yaml, do not change the order below
var defaultYaml = []string{"milvus.yaml", "default.yaml", "user.yaml"}
// BaseTable the basics of paramtable
type BaseTable struct {
@ -152,10 +153,22 @@ func (bt *BaseTable) init() {
func (bt *BaseTable) initConfigsFromLocal() {
refreshInterval := bt.config.refreshInterval
var files []string
for _, file := range bt.config.yamlFiles {
_, err := os.Stat(path.Join(bt.config.configDir, file))
// not found
if os.IsNotExist(err) {
continue
}
if err != nil {
log.Warn("failed to check file", zap.String("file", file), zap.Error(err))
panic(err)
}
files = append(files, path.Join(bt.config.configDir, file))
}
err := bt.mgr.AddSource(config.NewFileSource(&config.FileInfo{
Files: lo.Map(bt.config.yamlFiles, func(file string, _ int) string {
return path.Join(bt.config.configDir, file)
}),
Files: files,
RefreshInterval: time.Duration(refreshInterval) * time.Second,
}))
if err != nil {