*: upgrade etcd to master

Gopkg.toml

@@ -5,15 +5,15 @@
 
 [[constraint]]
   name = "github.com/coreos/etcd"
-  version = "=3.3.4"
+  branch = "master"
 
 [[override]]
   name = "github.com/coreos/bbolt"
   version = "=v1.3.1-coreos.6"
 
 [[override]]
   name = "github.com/grpc-ecosystem/grpc-gateway"
-  version = "~1.3"
+  version = "~1.4"
 
 [[constraint]]
   name = "google.golang.org/grpc"

pd-client/leader_change_test.go

@@ -38,10 +38,10 @@ func (s *testLeaderChangeSuite) prepareClusterN(c *C, n int) (svrs map[string]*s
 
 	for i := 0; i < n; i++ {
 		cfg := cfgs[i]
-
 		go func() {
 			svr, err := server.CreateServer(cfg, api.NewHandler)
 			c.Assert(err, IsNil)
+			svr.SetUpTestMode()
 			err = svr.Run()
 			c.Assert(err, IsNil)
 			ch <- svr

pkg/etcdutil/etcdutil.go

@@ -55,7 +55,7 @@ func CheckClusterID(localClusterID types.ID, um types.URLsMap, tlsConfig *tls.Co
 		trp := &http.Transport{
 			TLSClientConfig: tlsConfig,
 		}
-		remoteCluster, gerr := etcdserver.GetClusterFromRemotePeers([]string{u}, trp)
+		remoteCluster, gerr := etcdserver.GetClusterFromRemotePeers(nil, []string{u}, trp)
 		trp.CloseIdleConnections()
 		if gerr != nil {
 			// Do not return error, because other members may be not ready.

pkg/etcdutil/etcdutil_test.go

@@ -42,6 +42,8 @@ func newTestSingleConfig() *embed.Config {
 	cfg.Name = "test_etcd"
 	cfg.Dir, _ = ioutil.TempDir("/tmp", "test_etcd")
 	cfg.WalDir = ""
+	cfg.Logger = "zap"
+	cfg.LogOutputs = []string{"stdout"}
 
 	pu, _ := url.Parse(tempurl.Alloc())
 	cfg.LPUrls = []url.URL{*pu}

server/api/server_test.go

@@ -80,6 +80,7 @@ func mustNewCluster(c *C, num int) ([]*server.Config, []*server.Server, cleanUpF
 		go func(cfg *server.Config) {
 			s, err := server.CreateServer(cfg, NewHandler)
 			c.Assert(err, IsNil)
+			s.SetUpTestMode()
 			err = s.Run()
 			c.Assert(err, IsNil)
 			ch <- s

server/api/store_ns_test.go

@@ -61,12 +61,13 @@ func (s *testStoreNsSuite) SetUpSuite(c *C) {
 
 	cfg := server.NewTestSingleConfig()
 	cfg.NamespaceClassifier = "table"
-	srv, err := server.CreateServer(cfg, NewHandler)
+	svr, err := server.CreateServer(cfg, NewHandler)
 	c.Assert(err, IsNil)
-	c.Assert(srv.Run(), IsNil)
-	s.svr = srv
+	svr.SetUpTestMode()
+	c.Assert(svr.Run(), IsNil)
+	s.svr = svr
 	s.cleanup = func() {
-		srv.Close()
+		svr.Close()
 		cleanServer(cfg)
 	}
 

server/join.go

@@ -73,8 +73,10 @@ func PrepareJoinCluster(cfg *Config) error {
 	}
 
 	// Cases with data directory.
+	// The path change from "member" to "member/wal"
+	// Reference: https://github.com/coreos/etcd/pull/9733
 	initialCluster := ""
-	if wal.Exist(path.Join(cfg.DataDir, "member")) {
+	if wal.Exist(path.Join(cfg.DataDir, "member/wal")) {
 		cfg.InitialCluster = initialCluster
 		cfg.InitialClusterState = embed.ClusterStateFlagExisting
 		return nil

server/join_test.go

@@ -105,6 +105,7 @@ func startPdWith(cfg *Config) (*Server, error) {
 			errCh <- errors.Trace(err)
 			return
 		}
+		svr.SetUpTestMode()
 		err = svr.Run()
 		if err != nil {
 			errCh <- errors.Trace(err)

server/leader_test.go

@@ -33,16 +33,15 @@ type testGetLeaderSuite struct {
 func (s *testGetLeaderSuite) SetUpSuite(c *C) {
 	cfg := NewTestSingleConfig()
 
-	// Send requests before server has started.
 	s.wg.Add(1)
 	s.done = make(chan bool)
-	go s.sendRequest(c, cfg.ClientUrls)
-	time.Sleep(100 * time.Millisecond)
-
 	svr, err := CreateServer(cfg, nil)
 	c.Assert(err, IsNil)
-
+	svr.SetUpTestMode()
 	err = svr.Run()
+	// Send requests after server has started.
+	go s.sendRequest(c, cfg.ClientUrls)
+	time.Sleep(100 * time.Millisecond)
 	c.Assert(err, IsNil)
 
 	s.svr = svr

server/server.go

@@ -285,6 +285,16 @@ func (s *Server) Run() error {
 	return nil
 }
 
+// SetUpTestMode for testing
+func (s *Server) SetUpTestMode() {
+	// The etcd master version has removed embed.Config.SetupLogging.
+	// Now logger is set up automatically based on embed.Config.Logger, embed.Config.LogOutputs, embed.Config.Debug fields.
+	// Use zap logger in the test, otherwise will panic. Reference: https://github.com/coreos/etcd/blob/master/embed/config_logging.go#L45
+	s.etcdCfg.Logger = "zap"
+	s.etcdCfg.LogOutputs = []string{"stdout"}
+	s.etcdCfg.Debug = false
+}
+
 func (s *Server) bootstrapCluster(req *pdpb.BootstrapRequest) (*pdpb.BootstrapResponse, error) {
 	clusterID := s.clusterID
 

server/server_test.go

@@ -36,6 +36,7 @@ func newTestServer(c *C) (*Server, cleanUpFunc) {
 
 	svr, err := CreateServer(cfg, nil)
 	c.Assert(err, IsNil)
+	svr.SetUpTestMode()
 
 	cleanup := func() {
 		svr.Close()
@@ -94,6 +95,7 @@ func (s *testLeaderServerSuite) SetUpSuite(c *C) {
 		go func() {
 			svr, err := CreateServer(cfg, nil)
 			c.Assert(err, IsNil)
+			svr.SetUpTestMode()
 			err = svr.Run()
 			c.Assert(err, IsNil)
 			ch <- svr
@@ -149,6 +151,7 @@ func newTestServersWithCfgs(c *C, cfgs []*Config) ([]*Server, cleanupFunc) {
 		go func(cfg *Config) {
 			svr, err := CreateServer(cfg, nil)
 			c.Assert(err, IsNil)
+			svr.SetUpTestMode()
 			err = svr.Run()
 			c.Assert(err, IsNil)
 			ch <- svr
@@ -268,6 +271,7 @@ func (s *testServerSuite) TestCheckClusterID(c *C) {
 	cfgA.InitialCluster = originInitial
 	svr, err := CreateServer(cfgA, nil)
 	c.Assert(err, IsNil)
+	svr.SetUpTestMode()
 	err = svr.Run()
 	c.Assert(err, NotNil)
 }

server/testutil.go

@@ -43,6 +43,7 @@ func NewTestServer() (*Config, *Server, CleanupFunc, error) {
 	if err != nil {
 		return nil, nil, nil, errors.Trace(err)
 	}
+	s.SetUpTestMode()
 	if err = s.Run(); err != nil {
 		return nil, nil, nil, errors.Trace(err)
 	}