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

Jump to bottom

store_command: propagate the error code to the root command #8795

Closed
wants to merge 6 commits into from
Closed

store_command: propagate the error code to the root command #8795

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ae3d649
add error code reporting in the store command
JackL9u Nov 7, 2024
03b1e54
fixed the bug mention in issue 8762
JackL9u Nov 8, 2024
b9c721d
Merge branch 'tikv:master' into dev
JackL9u Nov 8, 2024
4d6a119
Merge remote-tracking branch 'upstream/master' into dev
JackL9u Nov 8, 2024
f7299cd
fixed error string style
JackL9u Nov 8, 2024
1940c32
Merge branch 'dev' of https://github.com/JackL9u/pd into dev
JackL9u Nov 8, 2024
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
10 changes: 5 additions & 5 deletions tools/pd-ctl/pdctl/command/store_command.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ func NewDeleteStoreByAddrCommand() *cobra.Command {
d := &cobra.Command{
Use: "addr <address>",
Short: "delete store by its address",
Run: deleteStoreCommandByAddrFunc,
RunE: deleteStoreCommandByAddrFunc,
}
return d
}
Expand Down Expand Up @@ -378,19 +378,19 @@ func deleteStoreCommandFunc(cmd *cobra.Command, args []string) {
cmd.Println("Success!")
}

func deleteStoreCommandByAddrFunc(cmd *cobra.Command, args []string) {
func deleteStoreCommandByAddrFunc(cmd *cobra.Command, args []string) error {
id := getStoreID(cmd, args, false)
if id == -1 {
return
return fmt.Errorf("store not find")
}
// delete store by its ID
prefix := fmt.Sprintf(storePrefix, id)
_, err := doRequest(cmd, prefix, http.MethodDelete, http.Header{})
if err != nil {
cmd.Printf("Failed to delete store %s: %s\n", args[0], err)
return
return fmt.Errorf("failed to delete store")
}
cmd.Println("Success!")
return nil
}

func cancelDeleteStoreCommandFunc(cmd *cobra.Command, args []string) {
Expand Down
Loading