tools: support get all groups (tikv#6714)

ref tikv#5895, ref tikv#6706 Signed-off-by: Ryan Leung <rleungx@gmail.com>
rleungx · Aug 2, 2023 · 2f5eccb · 2f5eccb
1 parent 7c6cc4f
commit 2f5eccb
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/tools/pd-ctl/pdctl/command/keyspace_group_command.go b/tools/pd-ctl/pdctl/command/keyspace_group_command.go
@@ -132,13 +132,15 @@ func showKeyspaceGroupsCommandFunc(cmd *cobra.Command, args []string) {
 			cmd.Printf("Failed to get state: %s\n", err)
 		}
 		stateValue := ""
-		state = strings.ToLower(state)
-		switch state {
-		case "merge", "split":
-			stateValue = fmt.Sprintf("state=%v", state)
-		default:
-			cmd.Println("Unknown state: " + state)
-			return
+		if len(state) != 0 {
+			state = strings.ToLower(state)
+			switch state {
+			case "merge", "split":
+				stateValue = fmt.Sprintf("state=%v", state)
+			default:
+				cmd.Println("Unknown state: " + state)
+				return
+			}
 		}
 
 		if len(stateValue) != 0 {

diff --git a/tools/pd-ctl/pdctl/command/store_command.go b/tools/pd-ctl/pdctl/command/store_command.go
@@ -565,7 +565,6 @@ func labelStoreCommandFunc(cmd *cobra.Command, args []string) {
 	} else if rewrite, _ := cmd.Flags().GetBool("rewrite"); rewrite {
 		prefix += "?force=true"
 	}
-	cmd.Println(prefix)
 	postJSON(cmd, prefix, labels)
 }