mirror of
https://github.com/seaweedfs/seaweedfs.git
synced 2026-11-13 23:39:33 +01:00
bac2196d65
* shell: return flag parse errors from every command 48 commands returned nil when their flags failed to parse, so a mistyped flag printed the flag error but the command still counted as a success: a piped weed shell run exited 0, the master maintenance loop logged no error, and admin script jobs reported the line as done. Return the parse error as s3.bucket.create (#12544) and the other shell commands already do. TestCommandsReturnFlagParseErrors runs every registered command with an unknown flag and fails for the 48 on master. Signed-off-by: anant <170962632+antcybersec@users.noreply.github.com> * shell: don't report -h as a failure With the parse errors returned, -h on those commands now returns flag.ErrHelp, so the shell printed "error: flag: help requested" and a piped run exited 1. The flag package has already printed the usage, so processEachCmd now treats flag.ErrHelp as success for every command. Signed-off-by: anant <170962632+antcybersec@users.noreply.github.com> * shell: keep the -h test beside the flag parse test TestProcessEachCmdTreatsHelpAsSuccess covers the same change as TestCommandsReturnFlagParseErrors, so it lives in the same new file and shell_liner_test.go stays as it was. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> --------- Signed-off-by: anant <170962632+antcybersec@users.noreply.github.com> Co-authored-by: anant <170962632+antcybersec@users.noreply.github.com> Co-authored-by: Chris Lu <chrislusf@users.noreply.github.com> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
62 lines
1.3 KiB
Go
62 lines
1.3 KiB
Go
package shell
|
|
|
|
import (
|
|
"context"
|
|
"flag"
|
|
"fmt"
|
|
"io"
|
|
|
|
"github.com/seaweedfs/seaweedfs/weed/pb/master_pb"
|
|
)
|
|
|
|
func init() {
|
|
Commands = append(Commands, &commandRaftServerRemove{})
|
|
}
|
|
|
|
type commandRaftServerRemove struct {
|
|
}
|
|
|
|
func (c *commandRaftServerRemove) Name() string {
|
|
return "cluster.raft.remove"
|
|
}
|
|
|
|
func (c *commandRaftServerRemove) Help() string {
|
|
return `remove a server from the raft cluster
|
|
|
|
Example:
|
|
cluster.raft.remove -id <server_name>
|
|
`
|
|
}
|
|
|
|
func (c *commandRaftServerRemove) HasTag(CommandTag) bool {
|
|
return false
|
|
}
|
|
|
|
func (c *commandRaftServerRemove) Do(args []string, commandEnv *CommandEnv, writer io.Writer) (err error) {
|
|
|
|
raftServerAddCommand := flag.NewFlagSet(c.Name(), flag.ContinueOnError)
|
|
serverId := raftServerAddCommand.String("id", "", "server id")
|
|
if err = raftServerAddCommand.Parse(args); err != nil {
|
|
return err
|
|
}
|
|
|
|
if *serverId == "" {
|
|
return fmt.Errorf("empty server id")
|
|
}
|
|
|
|
err = commandEnv.MasterClient.WithClient(context.Background(), false, func(client master_pb.SeaweedClient) error {
|
|
_, err := client.RaftRemoveServer(context.Background(), &master_pb.RaftRemoveServerRequest{
|
|
Id: *serverId,
|
|
Force: true,
|
|
})
|
|
if err != nil {
|
|
return fmt.Errorf("raft remove server: %w", err)
|
|
}
|
|
println("removed server", *serverId)
|
|
return nil
|
|
})
|
|
|
|
return err
|
|
|
|
}
|