address comment

server/api/cluster.go

@@ -16,7 +16,6 @@ package api
 import (
 	"net/http"
 
-	"github.com/gorilla/mux"
 	"github.com/juju/errors"
 	"github.com/pingcap/pd/server"
 	"github.com/unrolled/render"
@@ -40,17 +39,11 @@ func (h *clusterHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	h.rd.JSON(w, http.StatusOK, h.svr.GetCluster())
 }
 
-func (h *clusterHandler) GetRaftClusterBootstrapTime(w http.ResponseWriter, r *http.Request) {
-	option := mux.Vars(r)["bootstrap_time"]
-	switch option {
-	case option:
-		data, err := h.svr.GetRaftClusterBootstrapTime()
-		if err != nil {
-			h.rd.JSON(w, http.StatusInternalServerError, err.Error())
-			return
-		}
-		h.rd.JSON(w, http.StatusOK, data)
-	default:
-		h.rd.JSON(w, http.StatusInternalServerError, errUnknownStatusOption.Error())
+func (h *clusterHandler) GetRaftClusterStatus(w http.ResponseWriter, r *http.Request) {
+	status, err := h.svr.GetRaftClusterStatus()
+	if err != nil {
+		h.rd.JSON(w, http.StatusInternalServerError, err.Error())
+		return
 	}
+	h.rd.JSON(w, http.StatusOK, status)
 }

server/api/cluster_test.go

@@ -59,14 +59,14 @@ func (s *testClusterInfo) TestCluster(c *C) {
 	c.Assert(c1, DeepEquals, c2)
 }
 
-func (s *testClusterInfo) TestGetBootstrapTime(c *C) {
-	url := fmt.Sprintf("%s/cluster/raft/status/bootstrap_time", s.urlPrefix)
-	var t, now time.Time
-	err := readJSONWithURL(url, t)
+func (s *testClusterInfo) TestGetClusterStatus(c *C) {
+	url := fmt.Sprintf("%s/cluster/raft/status", s.urlPrefix)
+	status := server.RaftClusterStatus{}
+	err := readJSONWithURL(url, &status)
 	c.Assert(err, NotNil)
-	now = time.Now()
+	now := time.Now()
 	mustBootstrapCluster(c, s.svr)
-	err = readJSONWithURL(url, &t)
+	err = readJSONWithURL(url, &status)
 	c.Assert(err, IsNil)
-	c.Assert(t.After(now), IsTrue)
+	c.Assert(status.BootstrapTime.After(now), IsTrue)
 }

server/api/router.go

@@ -27,7 +27,6 @@ func createRouter(prefix string, svr *server.Server) *mux.Router {
 	})
 
 	router := mux.NewRouter().PathPrefix(prefix).Subrouter()
-
 	handler := svr.GetHandler()
 
 	historyHanlder := newHistoryHandler(handler, rd)
@@ -46,7 +45,7 @@ func createRouter(prefix string, svr *server.Server) *mux.Router {
 	router.HandleFunc("/api/v1/schedulers/{name}", schedulerHandler.Delete).Methods("DELETE")
 
 	router.Handle("/api/v1/cluster", newClusterHandler(svr, rd)).Methods("GET")
-	router.HandleFunc("/api/v1/cluster/raft/status/{option}", newClusterHandler(svr, rd).GetRaftClusterBootstrapTime).Methods("GET")
+	router.HandleFunc("/api/v1/cluster/raft/status", newClusterHandler(svr, rd).GetRaftClusterStatus).Methods("GET")
 
 	confHandler := newConfHandler(svr, rd)
 	router.HandleFunc("/api/v1/config", confHandler.Get).Methods("GET")

server/cluster.go

@@ -61,6 +61,13 @@ type RaftCluster struct {
 
 	wg   sync.WaitGroup
 	quit chan struct{}
+
+	status *RaftClusterStatus
+}
+
+// RaftClusterStatus saves some state information
+type RaftClusterStatus struct {
+	BootstrapTime time.Time `json:"bootstrap_time"`
 }
 
 func newRaftCluster(s *Server, clusterID uint64) *RaftCluster {
@@ -72,6 +79,16 @@ func newRaftCluster(s *Server, clusterID uint64) *RaftCluster {
 	}
 }
 
+func (c *RaftCluster) loadClusterStatus() error {
+	status := &RaftClusterStatus{}
+	time, err := c.s.kv.getClusterBootstrapTime()
+	if err != nil {
+		return errors.Trace(err)
+	}
+	status.BootstrapTime = time
+	c.status = status
+	return nil
+}
 func (c *RaftCluster) start() error {
 	c.Lock()
 	defer c.Unlock()
@@ -187,16 +204,19 @@ func (s *Server) GetCluster() *metapb.Cluster {
 	}
 }
 
-// GetRaftClusterBootstrapTime gets raft cluster bootstrap time
-func (s *Server) GetRaftClusterBootstrapTime() (time.Time, error) {
-	data, err := getValue(s.client, makeBootstrapTimeKey(s.getClusterRootPath()))
-	if err != nil {
-		return zeroTime, errors.Trace(err)
-	}
-	if len(data) == 0 {
-		return zeroTime, ErrNotBootstrapped
+// GetRaftClusterStatus gets cluster status
+func (s *Server) GetRaftClusterStatus() (*RaftClusterStatus, error) {
+	s.cluster.Lock()
+	defer s.cluster.Unlock()
+	if s.cluster.status == nil {
+		err := s.cluster.loadClusterStatus()
+		if err != nil {
+			return nil, errors.Trace(err)
+		}
 	}
-	return parseTimestamp(data)
+	clone := &RaftClusterStatus{}
+	*clone = *(s.cluster.status)
+	return clone, nil
 }
 
 func (s *Server) createRaftCluster() error {

server/kv.go

@@ -65,6 +65,21 @@ func (kv *kv) regionPath(regionID uint64) string {
 	return path.Join(kv.clusterPath, "r", fmt.Sprintf("%020d", regionID))
 }
 
+func (kv *kv) clusterStatePath(option string) string {
+	return path.Join(kv.clusterPath, "status", option)
+}
+
+func (kv *kv) getClusterBootstrapTime() (time.Time, error) {
+	data, err := kv.load(kv.clusterStatePath("bootstrap_time"))
+	if err != nil {
+		return zeroTime, errors.Trace(err)
+	}
+	if len(data) == 0 {
+		return zeroTime, ErrNotBootstrapped
+	}
+	return parseTimestamp(data)
+}
+
 func (kv *kv) loadMeta(meta *metapb.Cluster) (bool, error) {
 	return kv.loadProto(kv.clusterPath, meta)
 }