server, client: fix hanging problem when etcd failed to start (tikv#1267

)

pd-client/client.go

@@ -153,7 +153,9 @@ func (c *client) initClusterID() error {
 	defer cancel()
 	for i := 0; i < maxInitClusterRetries; i++ {
 		for _, u := range c.urls {
-			members, err := c.getMembers(ctx, u)
+			timeoutCtx, timeoutCancel := context.WithTimeout(ctx, pdTimeout)
+			members, err := c.getMembers(timeoutCtx, u)
+			timeoutCancel()
 			if err != nil || members.GetHeader() == nil {
 				log.Errorf("[pd] failed to get cluster id: %v", err)
 				continue

server/server.go

@@ -42,7 +42,8 @@ import (
 )
 
 const (
-	etcdTimeout = time.Second * 3
+	etcdTimeout      = time.Second * 3
+	etcdStartTimeout = time.Minute * 5
 	// pdRootPath for all pd servers.
 	pdRootPath      = "/pd"
 	pdAPIPrefix     = "/pd/"
@@ -120,6 +121,9 @@ func CreateServer(cfg *Config, apiRegister func(*Server) http.Handler) (*Server,
 
 func (s *Server) startEtcd() error {
 	log.Info("start embed etcd")
+	ctx, cancel := context.WithTimeout(ctx, etcdStartTimeout)
+	defer cancel()
+
 	etcd, err := embed.StartEtcd(s.etcdCfg)
 	if err != nil {
 		return errors.Trace(err)