Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 9 commits into from
Oct 10, 2017
Merged

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

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
dfed675
status: add new http status API for get meta regions.
hicqu Sep 21, 2017
bdd766f
add test case about /regions/meta.
hicqu Sep 21, 2017
9c168a9
Merge branch 'master' into qupeng/meta-region
hicqu Sep 21, 2017
56d2c2a
Merge branch 'master' into qupeng/meta-region
hicqu Sep 28, 2017
14d35fd
address comments.
hicqu Sep 28, 2017
75b634e
Merge branch 'master' into qupeng/meta-region
hicqu Sep 28, 2017
6a5cfc3
address comments.
hicqu Sep 29, 2017
4e07c35
Merge branch 'master' into qupeng/meta-region
hicqu Sep 29, 2017
e2000be
Merge branch 'master' into qupeng/meta-region
disksing Oct 10, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions server/http_status.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,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})
Expand Down
19 changes: 19 additions & 0 deletions server/region_handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,6 +288,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)
Expand Down
18 changes: 18 additions & 0 deletions server/region_handler_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why not verify the body?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Now we do verify whether the body is a valid json array or not.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why not verify if it is region meta?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed. PTAL, thanks!


// 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))
Expand Down