config: disable label check by default (#1568)

Signed-off-by: nolouch <nolouch@gmail.com>
tikv · Jun 10, 2019 · 8051f7b · 8051f7b
1 parent ebf6cf2
commit 8051f7b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/server/api/store_test.go b/server/api/store_test.go
@@ -147,6 +147,12 @@ func (s *testStoreSuite) TestStoreLabel(c *C) {
 	c.Assert(err, IsNil)
 	c.Assert(info.Store.Labels, HasLen, 0)
 
+	// Test merge.
+	// enable label match check.
+	labelCheck := map[string]string{"strictly-match-label": "true"}
+	lc, _ := json.Marshal(labelCheck)
+	err = postJSON(s.urlPrefix+"/config", lc)
+	c.Assert(err, IsNil)
 	// Test set.
 	labels := map[string]string{"zone": "cn", "host": "local"}
 	b, err := json.Marshal(labels)
@@ -169,8 +175,8 @@ func (s *testStoreSuite) TestStoreLabel(c *C) {
 
 	// Test merge.
 	// disable label match check.
-	labelCheck := map[string]string{"strictly-match-label": "false"}
-	lc, _ := json.Marshal(labelCheck)
+	labelCheck = map[string]string{"strictly-match-label": "false"}
+	lc, _ = json.Marshal(labelCheck)
 	err = postJSON(s.urlPrefix+"/config", lc)
 	c.Assert(err, IsNil)
 

diff --git a/server/config.go b/server/config.go
@@ -198,7 +198,7 @@ const (
 	defaultLeaderPriorityCheckInterval = time.Minute
 
 	defaultUseRegionStorage   = true
-	defaultStrictlyMatchLabel = true
+	defaultStrictlyMatchLabel = false
 )
 
 func adjustString(v *string, defValue string) {