-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
pd-ctl, tests: add the keyspace group commands (tikv#6423)
ref tikv#6232 Add the keyspace group commands to show and split keyspace groups. Signed-off-by: JmPotato <[email protected]> Co-authored-by: ti-chi-bot[bot] <108142056+ti-chi-bot[bot]@users.noreply.github.com>
- Loading branch information
Showing
7 changed files
with
233 additions
and
3 deletions.
There are no files selected for viewing
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,84 @@ | ||
| // Copyright 2023 TiKV Project Authors. | ||
| // | ||
| // 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, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| package keyspace_test | ||
|
|
||
| import ( | ||
| "context" | ||
| "encoding/json" | ||
| "fmt" | ||
| "testing" | ||
|
|
||
| "github.com/stretchr/testify/require" | ||
| "github.com/tikv/pd/pkg/mcs/utils" | ||
| "github.com/tikv/pd/pkg/storage/endpoint" | ||
| "github.com/tikv/pd/server/apiv2/handlers" | ||
| "github.com/tikv/pd/tests" | ||
| "github.com/tikv/pd/tests/pdctl" | ||
| handlersutil "github.com/tikv/pd/tests/server/apiv2/handlers" | ||
| pdctlCmd "github.com/tikv/pd/tools/pd-ctl/pdctl" | ||
| ) | ||
|
|
||
| func TestKeyspaceGroup(t *testing.T) { | ||
| re := require.New(t) | ||
| ctx, cancel := context.WithCancel(context.Background()) | ||
| defer cancel() | ||
| tc, err := tests.NewTestAPICluster(ctx, 1) | ||
| re.NoError(err) | ||
| err = tc.RunInitialServers() | ||
| re.NoError(err) | ||
| tc.WaitLeader() | ||
| leaderServer := tc.GetServer(tc.GetLeader()) | ||
| re.NoError(leaderServer.BootstrapCluster()) | ||
| pdAddr := tc.GetConfig().GetClientURL() | ||
| cmd := pdctlCmd.GetRootCmd() | ||
|
|
||
| // Show keyspace group information. | ||
| defaultKeyspaceGroupID := fmt.Sprintf("%d", utils.DefaultKeyspaceGroupID) | ||
| args := []string{"-u", pdAddr, "keyspace-group"} | ||
| output, err := pdctl.ExecuteCommand(cmd, append(args, defaultKeyspaceGroupID)...) | ||
| re.NoError(err) | ||
| var keyspaceGroup endpoint.KeyspaceGroup | ||
| err = json.Unmarshal(output, &keyspaceGroup) | ||
| re.NoError(err) | ||
| re.Equal(utils.DefaultKeyspaceGroupID, keyspaceGroup.ID) | ||
| re.Contains(keyspaceGroup.Keyspaces, utils.DefaultKeyspaceID) | ||
| // Split keyspace group. | ||
| handlersutil.MustCreateKeyspaceGroup(re, leaderServer, &handlers.CreateKeyspaceGroupParams{ | ||
| KeyspaceGroups: []*endpoint.KeyspaceGroup{ | ||
| { | ||
| ID: 1, | ||
| UserKind: endpoint.Standard.String(), | ||
| Members: make([]endpoint.KeyspaceGroupMember, utils.KeyspaceGroupDefaultReplicaCount), | ||
| Keyspaces: []uint32{111, 222, 333}, | ||
| }, | ||
| }, | ||
| }) | ||
| _, err = pdctl.ExecuteCommand(cmd, append(args, "split", "1", "2", "222", "333")...) | ||
| re.NoError(err) | ||
| output, err = pdctl.ExecuteCommand(cmd, append(args, "1")...) | ||
| re.NoError(err) | ||
| keyspaceGroup = endpoint.KeyspaceGroup{} | ||
| err = json.Unmarshal(output, &keyspaceGroup) | ||
| re.NoError(err) | ||
| re.Equal(uint32(1), keyspaceGroup.ID) | ||
| re.Equal(keyspaceGroup.Keyspaces, []uint32{111}) | ||
| output, err = pdctl.ExecuteCommand(cmd, append(args, "2")...) | ||
| re.NoError(err) | ||
| keyspaceGroup = endpoint.KeyspaceGroup{} | ||
| err = json.Unmarshal(output, &keyspaceGroup) | ||
| re.NoError(err) | ||
| re.Equal(uint32(2), keyspaceGroup.ID) | ||
| re.Equal(keyspaceGroup.Keyspaces, []uint32{222, 333}) | ||
| } |
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,83 @@ | ||
| // Copyright 2023 TiKV Project Authors. | ||
| // | ||
| // 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, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| package command | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "net/http" | ||
| "strconv" | ||
|
|
||
| "github.com/spf13/cobra" | ||
| ) | ||
|
|
||
| const keyspaceGroupsPrefix = "pd/api/v2/tso/keyspace-groups" | ||
|
|
||
| // NewKeyspaceGroupCommand return a keyspace group subcommand of rootCmd | ||
| func NewKeyspaceGroupCommand() *cobra.Command { | ||
| cmd := &cobra.Command{ | ||
| Use: "keyspace-group <keyspace_group_id>", | ||
| Short: "show keyspace group information with the given ID", | ||
| Run: showKeyspaceGroupCommandFunc, | ||
| } | ||
| cmd.AddCommand(newSplitKeyspaceGroupCommand()) | ||
| return cmd | ||
| } | ||
|
|
||
| func newSplitKeyspaceGroupCommand() *cobra.Command { | ||
| r := &cobra.Command{ | ||
| Use: "split <keyspace_group_id> <new_keyspace_group_id> [<keyspace_id>]", | ||
| Short: "split the keyspace group with the given ID and transfer the keyspaces into the newly split one", | ||
| Run: splitKeyspaceGroupCommandFunc, | ||
| } | ||
| return r | ||
| } | ||
|
|
||
| func showKeyspaceGroupCommandFunc(cmd *cobra.Command, args []string) { | ||
| if len(args) < 1 { | ||
| cmd.Usage() | ||
| return | ||
| } | ||
| r, err := doRequest(cmd, fmt.Sprintf("%s/%s", keyspaceGroupsPrefix, args[0]), http.MethodGet, http.Header{}) | ||
| if err != nil { | ||
| cmd.Printf("Failed to get the keyspace groups information: %s\n", err) | ||
| return | ||
| } | ||
| cmd.Println(r) | ||
| } | ||
|
|
||
| func splitKeyspaceGroupCommandFunc(cmd *cobra.Command, args []string) { | ||
| if len(args) < 3 { | ||
| cmd.Usage() | ||
| return | ||
| } | ||
| newID, err := strconv.ParseUint(args[1], 10, 32) | ||
| if err != nil { | ||
| cmd.Printf("Failed to parse the new keyspace group ID: %s\n", err) | ||
| return | ||
| } | ||
| keyspaces := make([]uint32, 0, len(args)-2) | ||
| for _, arg := range args[2:] { | ||
| id, err := strconv.ParseUint(arg, 10, 32) | ||
| if err != nil { | ||
| cmd.Printf("Failed to parse the keyspace ID: %s\n", err) | ||
| return | ||
| } | ||
| keyspaces = append(keyspaces, uint32(id)) | ||
| } | ||
| postJSON(cmd, fmt.Sprintf("%s/%s/split", keyspaceGroupsPrefix, args[0]), map[string]interface{}{ | ||
| "new-id": uint32(newID), | ||
| "keyspaces": keyspaces, | ||
| }) | ||
| } |
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