From 2130d6c9d1af5978f819b1ec6808bb492eb43277 Mon Sep 17 00:00:00 2001
From: disksing <i@disksing.com>
Date: Thu, 11 Oct 2018 15:32:54 +0800
Subject: [PATCH] server: add timeout for starting etcd

---
 server/server.go | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/server/server.go b/server/server.go
index 0ce44c4abb7..e7820b67651 100644
--- 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)