-
Notifications
You must be signed in to change notification settings - Fork 721
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.
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
placement: add API support #1894
Merged
Merged
Changes from 7 commits
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
acc7d0e
api: support placement rules
disksing e470bae
fix status code
disksing c96ecb8
add doc
disksing 33d89d2
fix doc
disksing 03c0779
Merge branch 'master' into placement8
disksing b851d1f
address comment
disksing 10ced5d
Merge branch 'master' into placement8
disksing f9d114f
fix lint
disksing e3db15f
Merge branch 'placement8' of https://github.com/disksing/pd into plac…
disksing 6a733b4
Update server/api/rule.go
disksing 6677c99
Update server/api/rule.go
disksing 51fd74e
Merge branch 'master' into placement8
sre-bot File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,210 @@ | ||
| // Copyright 2019 PingCAP, Inc. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| package api | ||
|
|
||
| import ( | ||
| "bytes" | ||
| "encoding/hex" | ||
| "net/http" | ||
| "strconv" | ||
|
|
||
| "github.com/gorilla/mux" | ||
| "github.com/pingcap/pd/pkg/apiutil" | ||
| "github.com/pingcap/pd/pkg/codec" | ||
| "github.com/pingcap/pd/server" | ||
| "github.com/pingcap/pd/server/core" | ||
| "github.com/pingcap/pd/server/schedule/placement" | ||
| "github.com/pkg/errors" | ||
| "github.com/unrolled/render" | ||
| ) | ||
|
|
||
| var placementDisabledErr = errors.New("placement rules feature is disabled") | ||
|
|
||
| type ruleHandler struct { | ||
| svr *server.Server | ||
| rd *render.Render | ||
| } | ||
|
|
||
| func newRulesHandler(svr *server.Server, rd *render.Render) *ruleHandler { | ||
| return &ruleHandler{ | ||
| svr: svr, | ||
| rd: rd, | ||
| } | ||
| } | ||
|
|
||
| func (h *ruleHandler) GetAll(w http.ResponseWriter, r *http.Request) { | ||
| cluster := h.svr.GetRaftCluster() | ||
| if cluster == nil { | ||
| h.rd.JSON(w, http.StatusInternalServerError, server.ErrNotBootstrapped.Error()) | ||
| return | ||
| } | ||
| if !cluster.IsPlacementRulesEnabled() { | ||
| h.rd.JSON(w, http.StatusPreconditionFailed, placementDisabledErr.Error()) | ||
| return | ||
| } | ||
| rules := cluster.GetRuleManager().GetAllRules() | ||
| h.rd.JSON(w, http.StatusOK, rules) | ||
| } | ||
|
|
||
| func (h *ruleHandler) GetAllByGroup(w http.ResponseWriter, r *http.Request) { | ||
| cluster := h.svr.GetRaftCluster() | ||
| if cluster == nil { | ||
| h.rd.JSON(w, http.StatusInternalServerError, server.ErrNotBootstrapped.Error()) | ||
| return | ||
| } | ||
| if !cluster.IsPlacementRulesEnabled() { | ||
| h.rd.JSON(w, http.StatusPreconditionFailed, placementDisabledErr.Error()) | ||
| return | ||
| } | ||
| group := mux.Vars(r)["group"] | ||
| rules := cluster.GetRuleManager().GetRulesByGroup(group) | ||
| h.rd.JSON(w, http.StatusOK, rules) | ||
| } | ||
|
|
||
| func (h *ruleHandler) GetAllByRegion(w http.ResponseWriter, r *http.Request) { | ||
| cluster := h.svr.GetRaftCluster() | ||
| if cluster == nil { | ||
| h.rd.JSON(w, http.StatusInternalServerError, server.ErrNotBootstrapped.Error()) | ||
| return | ||
| } | ||
| if !cluster.IsPlacementRulesEnabled() { | ||
| h.rd.JSON(w, http.StatusPreconditionFailed, placementDisabledErr.Error()) | ||
| return | ||
| } | ||
| regionStr := mux.Vars(r)["region"] | ||
| regionID, err := strconv.ParseUint(regionStr, 10, 64) | ||
| if err != nil { | ||
| h.rd.JSON(w, http.StatusBadRequest, "invalid region id") | ||
| return | ||
| } | ||
| region := cluster.GetRegion(regionID) | ||
| if region == nil { | ||
| h.rd.JSON(w, http.StatusNotFound, server.ErrRegionNotFound(regionID).Error()) | ||
| return | ||
| } | ||
| rules := cluster.GetRuleManager().GetRulesForApplyRegion(region) | ||
| h.rd.JSON(w, http.StatusOK, rules) | ||
| } | ||
|
|
||
| func (h *ruleHandler) GetAllByKey(w http.ResponseWriter, r *http.Request) { | ||
| cluster := h.svr.GetRaftCluster() | ||
| if cluster == nil { | ||
| h.rd.JSON(w, http.StatusInternalServerError, server.ErrNotBootstrapped.Error()) | ||
| return | ||
| } | ||
| if !cluster.IsPlacementRulesEnabled() { | ||
| h.rd.JSON(w, http.StatusPreconditionFailed, placementDisabledErr.Error()) | ||
| return | ||
| } | ||
| keyHex := mux.Vars(r)["key"] | ||
| key, err := hex.DecodeString(keyHex) | ||
| if err != nil { | ||
| h.rd.JSON(w, http.StatusBadRequest, "key should be hex format") | ||
disksing marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| return | ||
| } | ||
| rules := cluster.GetRuleManager().GetRulesByKey(key) | ||
| h.rd.JSON(w, http.StatusOK, rules) | ||
| } | ||
|
|
||
| func (h *ruleHandler) Get(w http.ResponseWriter, r *http.Request) { | ||
| cluster := h.svr.GetRaftCluster() | ||
| if cluster == nil { | ||
| h.rd.JSON(w, http.StatusInternalServerError, server.ErrNotBootstrapped.Error()) | ||
| return | ||
| } | ||
| if !cluster.IsPlacementRulesEnabled() { | ||
| h.rd.JSON(w, http.StatusPreconditionFailed, placementDisabledErr.Error()) | ||
| return | ||
| } | ||
| group, id := mux.Vars(r)["group"], mux.Vars(r)["id"] | ||
| rule := cluster.GetRuleManager().GetRule(group, id) | ||
| if rule == nil { | ||
| h.rd.JSON(w, http.StatusNotFound, nil) | ||
| return | ||
| } | ||
| h.rd.JSON(w, http.StatusOK, rule) | ||
| } | ||
|
|
||
| func (h *ruleHandler) Set(w http.ResponseWriter, r *http.Request) { | ||
| cluster := h.svr.GetRaftCluster() | ||
| if cluster == nil { | ||
| h.rd.JSON(w, http.StatusInternalServerError, server.ErrNotBootstrapped.Error()) | ||
| return | ||
| } | ||
| if !cluster.IsPlacementRulesEnabled() { | ||
| h.rd.JSON(w, http.StatusPreconditionFailed, placementDisabledErr.Error()) | ||
| return | ||
| } | ||
| var rule placement.Rule | ||
| if err := apiutil.ReadJSONRespondError(h.rd, w, r.Body, &rule); err != nil { | ||
| return | ||
| } | ||
| if err := h.checkRule(&rule); err != nil { | ||
| h.rd.JSON(w, http.StatusBadRequest, err.Error()) | ||
| return | ||
| } | ||
| if err := cluster.GetRuleManager().SetRule(&rule); err != nil { | ||
| h.rd.JSON(w, http.StatusInternalServerError, err.Error()) | ||
| return | ||
| } | ||
| h.rd.JSON(w, http.StatusOK, nil) | ||
| } | ||
|
|
||
| func (h *ruleHandler) checkRule(r *placement.Rule) error { | ||
| start, err := hex.DecodeString(r.StartKeyHex) | ||
| if err != nil { | ||
| return errors.Wrap(err, "start key is not hex format") | ||
disksing marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| } | ||
| end, err := hex.DecodeString(r.EndKeyHex) | ||
| if err != nil { | ||
| return errors.Wrap(err, "end key is not hex format") | ||
| } | ||
| if len(start) > 0 && bytes.Compare(end, start) <= 0 { | ||
| return errors.New("endKey should be greater than startKey") | ||
| } | ||
|
|
||
| keyType := h.svr.GetConfig().PDServerCfg.KeyType | ||
| if keyType == core.Table.String() || keyType == core.Txn.String() { | ||
| if len(start) > 0 { | ||
| if _, _, err = codec.DecodeBytes(start); err != nil { | ||
| return errors.Wrapf(err, "start key should be encoded in %s mode", keyType) | ||
| } | ||
| } | ||
| if len(end) > 0 { | ||
| if _, _, err = codec.DecodeBytes(end); err != nil { | ||
| return errors.Wrapf(err, "end key should be encoded in %s mode", keyType) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| return nil | ||
| } | ||
|
|
||
| func (h *ruleHandler) Delete(w http.ResponseWriter, r *http.Request) { | ||
| cluster := h.svr.GetRaftCluster() | ||
| if cluster == nil { | ||
| h.rd.JSON(w, http.StatusInternalServerError, server.ErrNotBootstrapped.Error()) | ||
| return | ||
| } | ||
| if !cluster.IsPlacementRulesEnabled() { | ||
| h.rd.JSON(w, http.StatusPreconditionFailed, placementDisabledErr.Error()) | ||
| return | ||
| } | ||
| group, id := mux.Vars(r)["group"], mux.Vars(r)["id"] | ||
| if err := cluster.GetRuleManager().DeleteRule(group, id); err != nil { | ||
| h.rd.JSON(w, http.StatusInternalServerError, err.Error()) | ||
| return | ||
| } | ||
| h.rd.JSON(w, http.StatusOK, nil) | ||
| } | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It is really verbose of these lines of code. Maybe you want to try the middleware https://github.com/gorilla/mux#middleware
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'll see what I can do for now.