Skip to content

Vitess: include cells filter in Vtctld API call #137

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

Merged
timvaillancourt merged 5 commits into from
Nov 30, 2020
Merged

Vitess: include cells filter in Vtctld API call #137

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
50696e1
Vitess: send cell filter list to Vtctld API
timvaillancourt Nov 26, 2020
a0d4341
Rename var
timvaillancourt Nov 26, 2020
aa49bdc
Rename var 2
timvaillancourt Nov 26, 2020
b916041
Merge branch 'master' into vitess-filter-cells-on-vtctld
timvaillancourt Nov 27, 2020
b2bce9e
Use net/url for building URL
timvaillancourt Nov 30, 2020
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
9 changes: 6 additions & 3 deletions pkg/vitess/api_client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,12 @@ func constructAPIURL(settings config.VitessConfigurationSettings) (url string) {
if !strings.HasSuffix(api, "/api") {
api = fmt.Sprintf("%s/api", api)
}
url = fmt.Sprintf("%s/keyspace/%s/tablets/%s", api, settings.Keyspace, settings.Shard)

return url
validCells := ParseCells(settings)
var queryParams string
if len(validCells) > 0 {
queryParams = fmt.Sprintf("?cells=%s", strings.Join(validCells, ","))
}
return fmt.Sprintf("%s/keyspace/%s/tablets/%s%s", api, settings.Keyspace, settings.Shard, queryParams)
}

// ParseCells returns a slice of non-empty Vitess cell names
Expand Down
2 changes: 1 addition & 1 deletion pkg/vitess/api_client_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (
func TestParseTablets(t *testing.T) {
vitessApi := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
switch r.URL.String() {
case "/api/keyspace/test/tablets/00":
case "/api/keyspace/test/tablets/00", "/api/keyspace/test/tablets/00?cells=cell2":
data, _ := json.Marshal([]Tablet{
{
Alias: &topodata.TabletAlias{Cell: "cell1"},
Expand Down