config: warn undefined config item (#1577) (#1608)

* config: warn undefined config item Signed-off-by: nolouch <nolouch@gmail.com>
tikv · Jul 2, 2019 · 9d5d619 · 9d5d619
1 parent 886362e
commit 9d5d619
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/server/config.go b/server/config.go
@@ -332,7 +332,7 @@ func (m *configMetaData) CheckUndecoded() error {
 func (c *Config) Adjust(meta *toml.MetaData) error {
 	configMetaData := newConfigMetadata(meta)
 	if err := configMetaData.CheckUndecoded(); err != nil {
-		return err
+		c.WarningMsgs = append(c.WarningMsgs, err.Error())
 	}
 	adjustString(&c.Name, defaultName)
 	adjustString(&c.DataDir, fmt.Sprintf("default.%s", c.Name))

diff --git a/server/config_test.go b/server/config_test.go
@@ -15,9 +15,9 @@ package server
 
 import (
 	"path"
+	"strings"
 
 	"github.com/BurntSushi/toml"
-
 	. "github.com/pingcap/check"
 	"github.com/pingcap/pd/server/core"
 )
@@ -122,5 +122,6 @@ type = "random-merge"
 	meta, err = toml.Decode(cfgData, &cfg)
 	c.Assert(err, IsNil)
 	err = cfg.Adjust(&meta)
-	c.Assert(err, NotNil)
+	c.Assert(err, IsNil)
+	c.Assert(strings.Contains(cfg.WarningMsgs[0], "Config contains undefined item"), IsTrue)
 }