From c4f2d415e7519afa2c416f31d14417d5f6166a6c Mon Sep 17 00:00:00 2001
From: qiuyesuifeng <cuiqiu.bupt@gmail.com>
Date: Thu, 5 May 2016 20:31:06 +0800
Subject: [PATCH] server: add creating raft cluster when become leader.

---
 server/cluster.go      | 19 +++++++++++++------
 server/cluster_test.go |  6 +++---
 server/conn.go         |  1 -
 server/leader.go       |  8 +++++++-
 4 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/server/cluster.go b/server/cluster.go
index 57dd3e2130a..820ac659222 100644
--- a/server/cluster.go
+++ b/server/cluster.go
@@ -139,25 +139,32 @@ func (s *Server) getRaftCluster() (*raftCluster, error) {
 		return s.cluster, nil
 	}
 
-	// Find in etcd
+	return nil, nil
+}
+
+func (s *Server) createRaftCluster() error {
+	if s.cluster.IsRunning() {
+		return nil
+	}
+
 	value, err := getValue(s.client, s.getClusterRootPath())
 	if err != nil {
-		return nil, errors.Trace(err)
+		return errors.Trace(err)
 	}
 	if value == nil {
-		return nil, nil
+		return nil
 	}
 
 	clusterMeta := metapb.Cluster{}
 	if err = proto.Unmarshal(value, &clusterMeta); err != nil {
-		return nil, errors.Trace(err)
+		return errors.Trace(err)
 	}
 
 	if err = s.cluster.Start(clusterMeta); err != nil {
-		return nil, errors.Trace(err)
+		return errors.Trace(err)
 	}
 
-	return s.cluster, nil
+	return nil
 }
 
 func encodeRegionSearchKey(endKey []byte) string {
diff --git a/server/cluster_test.go b/server/cluster_test.go
index 9b7920c1a66..062a3dcb6cd 100644
--- a/server/cluster_test.go
+++ b/server/cluster_test.go
@@ -336,12 +336,12 @@ func (s *testClusterCacheSuite) TestCache(c *C) {
 
 	cluster, err = s.svr.getRaftCluster()
 	c.Assert(err, IsNil)
+	c.Assert(cluster, IsNil)
 
-	allStores, err := cluster.GetAllStores()
+	allStores, err := s.svr.cluster.GetAllStores()
 	c.Assert(err, IsNil)
 	c.Assert(allStores, HasLen, 2)
 	for _, store := range allStores {
-		_, ok := stores[store.GetId()]
-		c.Assert(ok, IsTrue)
+		c.Assert(stores, HasKey, store.GetId())
 	}
 }
diff --git a/server/conn.go b/server/conn.go
index 7691dec640a..464cb58f7f2 100644
--- a/server/conn.go
+++ b/server/conn.go
@@ -61,7 +61,6 @@ func (c *conn) run() {
 			log.Errorf("handle request %s err %v", request, errors.ErrorStack(err))
 			response = NewError(err)
 		}
-
 		if response == nil {
 			// we don't need to response, maybe error?
 			// if error, we will return an error response later.
diff --git a/server/leader.go b/server/leader.go
index b9716e320b4..548f345b637 100644
--- a/server/leader.go
+++ b/server/leader.go
@@ -138,7 +138,13 @@ func (s *Server) campaignLeader() error {
 	s.enableLeader(true)
 	defer s.enableLeader(false)
 
-	// keeps the leader
+	// Try to create raft cluster.
+	err = s.createRaftCluster()
+	if err != nil {
+		return errors.Trace(err)
+	}
+
+	// Make the leader keepalived.
 	ch, err := lessor.KeepAlive(s.client.Ctx(), clientv3.LeaseID(leaseResp.ID))
 	if err != nil {
 		return errors.Trace(err)