server: add timeout for starting etcd

tikv · Oct 11, 2018 · 2130d6c · 2130d6c
1 parent 1c5f7d7
commit 2130d6c
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/server/server.go b/server/server.go
@@ -43,6 +43,7 @@ import (
 
 const (
 	etcdTimeout           = time.Second * 3
+	etcdStartTimeout      = time.Minute * 5
 	serverMetricsInterval = time.Minute
 	// pdRootPath for all pd servers.
 	pdRootPath      = "/pd"
@@ -134,6 +135,9 @@ func CreateServer(cfg *Config, apiRegister func(*Server) http.Handler) (*Server,
 
 func (s *Server) startEtcd(ctx context.Context) 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.WithStack(err)