Merge feb470d into bb61092

server/api/cluster.go

@@ -35,3 +35,12 @@ func newClusterHandler(svr *server.Server, rd *render.Render) *clusterHandler {
 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) {
+	data, err := h.svr.GetRaftClusterBootstrapTime()
+	if err != nil {
+		h.rd.JSON(w, http.StatusInternalServerError, err.Error())
+		return
+	}
+	h.rd.JSON(w, http.StatusOK, data)
+}

server/api/cluster_test.go

@@ -15,6 +15,7 @@ package api
 
 import (
 	"fmt"
+	"time"
 
 	. "github.com/pingcap/check"
 	"github.com/pingcap/kvproto/pkg/metapb"
@@ -57,3 +58,15 @@ func (s *testClusterInfo) TestCluster(c *C) {
 	c1.MaxPeerCount = 6
 	c.Assert(c1, DeepEquals, c2)
 }
+
+func (s *testClusterInfo) TestGetBootstrapTime(c *C) {
+	url := fmt.Sprintf("%s/raft/bootstrap/time", s.urlPrefix)
+	var t, now time.Time
+	err := readJSONWithURL(url, t)
+	c.Assert(err, NotNil)
+	now = time.Now()
+	mustBootstrapCluster(c, s.svr)
+	err = readJSONWithURL(url, &t)
+	c.Assert(err, IsNil)
+	c.Assert(t.After(now), IsTrue)
+}

server/api/event.go

@@ -36,7 +36,7 @@ func newFeedHandler(svr *server.Server, rd *render.Render) *feedHandler {
 func (h *feedHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	cluster := h.svr.GetRaftCluster()
 	if cluster == nil {
-		h.rd.JSON(w, http.StatusInternalServerError, errNotBootstrapped.Error())
+		h.rd.JSON(w, http.StatusInternalServerError, server.ErrNotBootstrapped.Error())
 		return
 	}
 
@@ -71,7 +71,7 @@ func newEventsHandler(svr *server.Server, rd *render.Render) *eventsHandler {
 func (h *eventsHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	cluster := h.svr.GetRaftCluster()
 	if cluster == nil {
-		h.rd.JSON(w, http.StatusInternalServerError, errNotBootstrapped.Error())
+		h.rd.JSON(w, http.StatusInternalServerError, server.ErrNotBootstrapped.Error())
 		return
 	}
 

server/api/label.go

@@ -38,7 +38,7 @@ func newLabelsHandler(svr *server.Server, rd *render.Render) *labelsHandler {
 func (h *labelsHandler) Get(w http.ResponseWriter, r *http.Request) {
 	cluster := h.svr.GetRaftCluster()
 	if cluster == nil {
-		h.rd.JSON(w, http.StatusInternalServerError, errNotBootstrapped.Error())
+		h.rd.JSON(w, http.StatusInternalServerError, server.ErrNotBootstrapped.Error())
 		return
 	}
 	var labels []*metapb.StoreLabel
@@ -59,7 +59,7 @@ func (h *labelsHandler) Get(w http.ResponseWriter, r *http.Request) {
 func (h *labelsHandler) GetStores(w http.ResponseWriter, r *http.Request) {
 	cluster := h.svr.GetRaftCluster()
 	if cluster == nil {
-		h.rd.JSON(w, http.StatusInternalServerError, errNotBootstrapped.Error())
+		h.rd.JSON(w, http.StatusInternalServerError, server.ErrNotBootstrapped.Error())
 		return
 	}
 

server/api/region.go

@@ -48,7 +48,7 @@ func newRegionHandler(svr *server.Server, rd *render.Render) *regionHandler {
 func (h *regionHandler) GetRegionByID(w http.ResponseWriter, r *http.Request) {
 	cluster := h.svr.GetRaftCluster()
 	if cluster == nil {
-		h.rd.JSON(w, http.StatusInternalServerError, errNotBootstrapped.Error())
+		h.rd.JSON(w, http.StatusInternalServerError, server.ErrNotBootstrapped.Error())
 		return
 	}
 
@@ -67,7 +67,7 @@ func (h *regionHandler) GetRegionByID(w http.ResponseWriter, r *http.Request) {
 func (h *regionHandler) GetRegionByKey(w http.ResponseWriter, r *http.Request) {
 	cluster := h.svr.GetRaftCluster()
 	if cluster == nil {
-		h.rd.JSON(w, http.StatusInternalServerError, errNotBootstrapped.Error())
+		h.rd.JSON(w, http.StatusInternalServerError, server.ErrNotBootstrapped.Error())
 		return
 	}
 	vars := mux.Vars(r)
@@ -91,7 +91,7 @@ func newRegionsHandler(svr *server.Server, rd *render.Render) *regionsHandler {
 func (h *regionsHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	cluster := h.svr.GetRaftCluster()
 	if cluster == nil {
-		h.rd.JSON(w, http.StatusInternalServerError, errNotBootstrapped.Error())
+		h.rd.JSON(w, http.StatusInternalServerError, server.ErrNotBootstrapped.Error())
 		return
 	}
 

server/api/router.go

@@ -46,6 +46,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/raft/bootstrap/time", newClusterHandler(svr, rd).GetRaftClusterBootstrapTime).Methods("GET")
 
 	confHandler := newConfHandler(svr, rd)
 	router.HandleFunc("/api/v1/config", confHandler.Get).Methods("GET")

server/api/server.go

@@ -17,17 +17,12 @@ import (
 	"net/http"
 
 	"github.com/gorilla/mux"
-	"github.com/juju/errors"
 	"github.com/pingcap/pd/server"
 	"github.com/urfave/negroni"
 )
 
 const apiPrefix = "/pd"
 
-var (
-	errNotBootstrapped = errors.New("TiKV cluster is not bootstrapped, please start TiKV first")
-)
-
 // NewHandler creates a HTTP handler for API.
 func NewHandler(svr *server.Server) http.Handler {
 	engine := negroni.New()

server/api/store.go

@@ -102,7 +102,7 @@ func newStoreHandler(svr *server.Server, rd *render.Render) *storeHandler {
 func (h *storeHandler) Get(w http.ResponseWriter, r *http.Request) {
 	cluster := h.svr.GetRaftCluster()
 	if cluster == nil {
-		h.rd.JSON(w, http.StatusInternalServerError, errNotBootstrapped.Error())
+		h.rd.JSON(w, http.StatusInternalServerError, server.ErrNotBootstrapped.Error())
 		return
 	}
 
@@ -127,7 +127,7 @@ func (h *storeHandler) Get(w http.ResponseWriter, r *http.Request) {
 func (h *storeHandler) Delete(w http.ResponseWriter, r *http.Request) {
 	cluster := h.svr.GetRaftCluster()
 	if cluster == nil {
-		h.rd.JSON(w, http.StatusInternalServerError, errNotBootstrapped.Error())
+		h.rd.JSON(w, http.StatusInternalServerError, server.ErrNotBootstrapped.Error())
 		return
 	}
 
@@ -169,7 +169,7 @@ func newStoresHandler(svr *server.Server, rd *render.Render) *storesHandler {
 func (h *storesHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	cluster := h.svr.GetRaftCluster()
 	if cluster == nil {
-		h.rd.JSON(w, http.StatusInternalServerError, errNotBootstrapped.Error())
+		h.rd.JSON(w, http.StatusInternalServerError, server.ErrNotBootstrapped.Error())
 		return
 	}
 

server/cluster.go

@@ -32,6 +32,11 @@ const (
 	backgroundJobInterval = time.Minute
 )
 
+// Error instances
+var (
+	ErrNotBootstrapped = errors.New("TiKV cluster is not bootstrapped, please start TiKV first")
+)
+
 // RaftCluster is used for cluster config management.
 // Raft cluster key format:
 // cluster 1 -> /1/raft, value is metapb.Cluster
@@ -182,6 +187,15 @@ 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)
+	}
+	return parseTimestamp(data)
+}
+
 func (s *Server) createRaftCluster() error {
 	if s.cluster.isRunning() {
 		return nil
@@ -206,6 +220,10 @@ func makeStoreKeyPrefix(clusterRootPath string) string {
 	return strings.Join([]string{clusterRootPath, "s", ""}, "/")
 }
 
+func makeBootstrapTimeKey(clusterRootPath string) string {
+	return strings.Join([]string{clusterRootPath, "bootstrap_time"}, "/")
+}
+
 func checkBootstrapRequest(clusterID uint64, req *pdpb.BootstrapRequest) error {
 	// TODO: do more check for request fields validation.
 
@@ -266,6 +284,13 @@ func (s *Server) bootstrapCluster(req *pdpb.BootstrapRequest) (*pdpb.BootstrapRe
 	var ops []clientv3.Op
 	ops = append(ops, clientv3.OpPut(clusterRootPath, string(clusterValue)))
 
+	// Set bootstrap time
+	bootstrapKey := makeBootstrapTimeKey(clusterRootPath)
+	nano := time.Now().UnixNano()
+
+	timeData := uint64ToBytes(uint64(nano))
+	ops = append(ops, clientv3.OpPut(bootstrapKey, string(timeData)))
+
 	// Set store meta
 	storeMeta := req.GetStore()
 	storePath := makeStoreKey(clusterRootPath, storeMeta.GetId())

server/tso.go

@@ -49,16 +49,7 @@ func (s *Server) loadTimestamp() (time.Time, error) {
 	if err != nil {
 		return zeroTime, errors.Trace(err)
 	}
-	if data == nil {
-		return zeroTime, nil
-	}
-
-	nano, err := bytesToUint64(data)
-	if err != nil {
-		return zeroTime, errors.Trace(err)
-	}
-
-	return time.Unix(0, int64(nano)), nil
+	return parseTimestamp(data)
 }
 
 // save timestamp, if lastTs is 0, we think the timestamp doesn't exist, so create it,

server/util.go

@@ -333,3 +333,16 @@ func diffRegionKeyInfo(origin *RegionInfo, other *RegionInfo) string {
 
 	return strings.Join(ret, ",")
 }
+
+func parseTimestamp(data []byte) (time.Time, error) {
+	if data == nil {
+		return zeroTime, nil
+	}
+
+	nano, err := bytesToUint64(data)
+	if err != nil {
+		return zeroTime, errors.Trace(err)
+	}
+
+	return time.Unix(0, int64(nano)), nil
+}