config: enable use region storage by default

server/config.go

@@ -195,6 +195,8 @@ const (
 	defaultHeartbeatStreamRebindInterval = time.Minute
 
 	defaultLeaderPriorityCheckInterval = time.Minute
+
+	defaultUseRegionStorage = true
 )
 
 func adjustString(v *string, defValue string) {
@@ -412,6 +414,10 @@ func (c *Config) Adjust(meta *toml.MetaData) error {
 		return err
 	}
 
+	if err := c.PDServerCfg.adjust(configMetaData.Child("pd-server")); err != nil {
+		return err
+	}
+
 	adjustDuration(&c.heartbeatStreamBindInterval, defaultHeartbeatStreamRebindInterval)
 
 	adjustDuration(&c.LeaderPriorityCheckInterval, defaultLeaderPriorityCheckInterval)
@@ -753,6 +759,13 @@ type PDServerConfig struct {
 	UseRegionStorage bool `toml:"use-region-storage" json:"use-region-storage,string"`
 }
 
+func (c *PDServerConfig) adjust(meta *configMetaData) error {
+	if !meta.IsDefined("use-region-storage") {
+		c.UseRegionStorage = defaultUseRegionStorage
+	}
+	return nil
+}
+
 // StoreLabel is the config item of LabelPropertyConfig.
 type StoreLabel struct {
 	Key   string `toml:"key" json:"key"`

tests/cluster.go

@@ -374,8 +374,20 @@ func (c *TestCluster) GetLeader() string {
 // If it exceeds the maximum number of loops, it will return an empty string.
 func (c *TestCluster) WaitLeader() string {
 	for i := 0; i < 100; i++ {
-		if leader := c.GetLeader(); leader != "" {
-			return leader
+		counter := make(map[string]int)
+		running := 0
+		for _, s := range c.servers {
+			if s.state == Running {
+				running++
+			}
+			if s.GetLeader().GetName() != "" {
+				counter[s.GetLeader().GetName()]++
+			}
+		}
+		for name, num := range counter {
+			if num == running && c.GetServer(name).IsLeader() {
+				return name
+			}
 		}
 		time.Sleep(500 * time.Millisecond)
 	}

tests/cmd/pdctl_test.go

@@ -30,6 +30,7 @@ import (
 	"github.com/pingcap/kvproto/pkg/metapb"
 	"github.com/pingcap/kvproto/pkg/pdpb"
 	"github.com/pingcap/pd/pkg/etcdutil"
+	"github.com/pingcap/pd/pkg/testutil"
 	"github.com/pingcap/pd/server"
 	"github.com/pingcap/pd/server/api"
 	"github.com/pingcap/pd/server/core"
@@ -1066,6 +1067,8 @@ func (s *cmdTestSuite) TestMember(c *C) {
 	err = cluster.RunInitialServers()
 	c.Assert(err, IsNil)
 	cluster.WaitLeader()
+	leaderServer := cluster.GetServer(cluster.GetLeader())
+	c.Assert(leaderServer.BootstrapCluster(), IsNil)
 	pdAddr := cluster.GetConfig().GetClientURLs()
 	c.Assert(err, IsNil)
 	cmd := initCommand()
@@ -1087,15 +1090,22 @@ func (s *cmdTestSuite) TestMember(c *C) {
 	args = []string{"-u", pdAddr, "member", "leader", "transfer", "pd2"}
 	_, _, err = executeCommandC(cmd, args...)
 	c.Assert(err, IsNil)
-	c.Assert("pd2", Equals, svr.GetLeader().GetName())
+	testutil.WaitUntil(c, func(c *C) bool {
+		return c.Check("pd2", Equals, svr.GetLeader().GetName())
+	})
 
 	// member leader resign
+	cluster.WaitLeader()
 	args = []string{"-u", pdAddr, "member", "leader", "resign"}
-	_, _, err = executeCommandC(cmd, args...)
+	_, output, err = executeCommandC(cmd, args...)
+	c.Assert(strings.Contains(string(output), "Success"), IsTrue)
 	c.Assert(err, IsNil)
-	c.Assert("pd2", Not(Equals), svr.GetLeader().GetName())
+	testutil.WaitUntil(c, func(c *C) bool {
+		return c.Check("pd2", Not(Equals), svr.GetLeader().GetName())
+	})
 
 	// member leader_priority <member_name> <priority>
+	cluster.WaitLeader()
 	args = []string{"-u", pdAddr, "member", "leader_priority", name, "100"}
 	_, _, err = executeCommandC(cmd, args...)
 	c.Assert(err, IsNil)
@@ -1123,6 +1133,7 @@ func (s *cmdTestSuite) TestMember(c *C) {
 	members, err = etcdutil.ListEtcdMembers(client)
 	c.Assert(err, IsNil)
 	c.Assert(len(members.Members), Equals, 2)
+	c.Succeed()
 }
 
 func (s *cmdTestSuite) TestHot(c *C) {

tests/server/api_test.go

@@ -15,16 +15,22 @@ package server_test
 
 import (
 	"net/http"
+	"time"
 
 	. "github.com/pingcap/check"
 	"github.com/pingcap/pd/pkg/testutil"
+	"github.com/pingcap/pd/pkg/typeutil"
+	"github.com/pingcap/pd/server"
 	"github.com/pingcap/pd/tests"
 )
 
 func (s *serverTestSuite) TestReconnect(c *C) {
 	c.Parallel()
 
-	cluster, err := tests.NewTestCluster(3)
+	cluster, err := tests.NewTestCluster(3, func(conf *server.Config) {
+		conf.TickInterval = typeutil.Duration{50 * time.Millisecond}
+		conf.ElectionInterval = typeutil.Duration{250 * time.Millisecond}
+	})
 	c.Assert(err, IsNil)
 	defer cluster.Destroy()
 
@@ -46,6 +52,7 @@ func (s *serverTestSuite) TestReconnect(c *C) {
 	err = cluster.GetServer(leader).Stop()
 	c.Assert(err, IsNil)
 	newLeader := cluster.WaitLeader()
+	c.Assert(len(newLeader), Not(Equals), 0)
 
 	// Make sure they proxy requests to the new leader.
 	for name, s := range cluster.GetServers() {