mirror of
https://gitee.com/milvus-io/milvus.git
synced 2024-11-29 18:38:44 +08:00
fix: Skip EOF error when default empty yaml file (#37445)
Related to #37404 --------- Signed-off-by: Congqi Xia <congqi.xia@zilliz.com>
This commit is contained in:
parent
9a9de3df5c
commit
0645d46ec6
@ -19,6 +19,7 @@ package config
|
||||
import (
|
||||
"bytes"
|
||||
"fmt"
|
||||
"io"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"sync"
|
||||
@ -146,7 +147,7 @@ func (fs *FileSource) loadFromFile() error {
|
||||
|
||||
var node yaml.Node
|
||||
decoder := yaml.NewDecoder(bytes.NewReader(data))
|
||||
if err := decoder.Decode(&node); err != nil {
|
||||
if err := decoder.Decode(&node); err != nil && !errors.Is(err, io.EOF) {
|
||||
return errors.Wrap(err, "YAML unmarshal failed: "+configFile)
|
||||
}
|
||||
|
||||
|
32
pkg/config/file_source_test.go
Normal file
32
pkg/config/file_source_test.go
Normal file
@ -0,0 +1,32 @@
|
||||
package config
|
||||
|
||||
import (
|
||||
"os"
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"github.com/stretchr/testify/assert"
|
||||
"github.com/stretchr/testify/require"
|
||||
)
|
||||
|
||||
func TestEmptyYaml(t *testing.T) {
|
||||
file, err := os.CreateTemp(os.TempDir(), "milvus_ut_config_fs_*.yaml")
|
||||
require.NoError(t, err)
|
||||
|
||||
filepath := file.Name()
|
||||
|
||||
file.WriteString("#")
|
||||
file.Close()
|
||||
|
||||
defer os.Remove(filepath)
|
||||
|
||||
fs := NewFileSource(&FileInfo{
|
||||
Files: []string{filepath},
|
||||
RefreshInterval: time.Hour,
|
||||
})
|
||||
|
||||
_, err = fs.GetConfigurations()
|
||||
assert.NoError(t, err)
|
||||
|
||||
fs.Close()
|
||||
}
|
Loading…
Reference in New Issue
Block a user