status: add new http status API for get meta regions. (#4597)

pingcap · Oct 10, 2017 · e9ffb58 · e9ffb58
1 parent e11c4fb
commit e9ffb58
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 0 deletions.
diff --git a/server/http_status.go b/server/http_status.go
@@ -47,6 +47,7 @@ func (s *Server) startHTTPServer() {
 		tikvHandler := s.newRegionHandler()
 		// HTTP path for regions
 		router.Handle("/tables/{db}/{table}/regions", tableRegionsHandler{tikvHandler})
+		router.Handle("/regions/meta", tikvHandler)
 		router.Handle("/regions/{regionID}", tikvHandler)
 		router.Handle("/mvcc/key/{db}/{table}/{recordID}", mvccTxnHandler{tikvHandler, opMvccGetByKey})
 		router.Handle("/mvcc/txn/{startTS}/{db}/{table}", mvccTxnHandler{tikvHandler, opMvccGetByTxn})

diff --git a/server/region_handler.go b/server/region_handler.go
@@ -289,6 +289,25 @@ func (rh tableRegionsHandler) ServeHTTP(w http.ResponseWriter, req *http.Request
 func (rh regionHandler) ServeHTTP(w http.ResponseWriter, req *http.Request) {
 	// parse and check params
 	params := mux.Vars(req)
+	if _, ok := params[pRegionID]; !ok {
+		startKey := []byte{'m'}
+		endKey := []byte{'n'}
+
+		recordRegionIDs, err := rh.regionCache.ListRegionIDsInKeyRange(rh.bo, startKey, endKey)
+		if err != nil {
+			rh.writeError(w, err)
+			return
+		}
+
+		recordRegions, err := rh.getRegionsMeta(recordRegionIDs)
+		if err != nil {
+			rh.writeError(w, err)
+			return
+		}
+		rh.writeData(w, recordRegions)
+		return
+	}
+
 	regionIDInt, err := strconv.ParseInt(params[pRegionID], 0, 64)
 	if err != nil {
 		rh.writeError(w, err)

diff --git a/server/region_handler_test.go b/server/region_handler_test.go
@@ -169,6 +169,24 @@ func (ts *TidbRegionHandlerTestSuite) TestGetRegionByIDWithError(c *C) {
 	defer resp.Body.Close()
 }
 
+func (ts *TidbRegionHandlerTestSuite) TestRegionsFromMeta(c *C) {
+	ts.startServer(c)
+	defer ts.stopServer(c)
+	resp, err := http.Get("http://127.0.0.1:10090/regions/meta")
+	c.Assert(err, IsNil)
+	defer resp.Body.Close()
+	c.Assert(resp.StatusCode, Equals, http.StatusOK)
+
+	// Verify the resp body.
+	decoder := json.NewDecoder(resp.Body)
+	metas := make([]RegionMeta, 0)
+	err = decoder.Decode(&metas)
+	c.Assert(err, IsNil)
+	for _, meta := range metas {
+		c.Assert(meta.ID != 0, IsTrue)
+	}
+}
+
 func (ts *TidbRegionHandlerTestSuite) startServer(c *C) {
 	mvccStore := mocktikv.NewMvccStore()
 	store, err := tikv.NewMockTikvStore(tikv.WithMVCCStore(mvccStore))