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>
67 lines
1.9 KiB
Go
67 lines
1.9 KiB
Go
package shell
|
|
|
|
import (
|
|
"context"
|
|
"flag"
|
|
"fmt"
|
|
"io"
|
|
|
|
"github.com/seaweedfs/seaweedfs/weed/pb"
|
|
"github.com/seaweedfs/seaweedfs/weed/storage/needle"
|
|
)
|
|
|
|
func init() {
|
|
Commands = append(Commands, &commandVolumeCopy{})
|
|
}
|
|
|
|
type commandVolumeCopy struct {
|
|
}
|
|
|
|
func (c *commandVolumeCopy) Name() string {
|
|
return "volume.copy"
|
|
}
|
|
|
|
func (c *commandVolumeCopy) Help() string {
|
|
return `copy a volume from one volume server to another volume server
|
|
|
|
volume.copy -source <source volume server host:port> -target <target volume server host:port> -volumeId <volume id>
|
|
|
|
This command copies a volume from one volume server to another volume server.
|
|
Usually you will want to unmount the volume first before copying.
|
|
|
|
`
|
|
}
|
|
|
|
func (c *commandVolumeCopy) HasTag(CommandTag) bool {
|
|
return false
|
|
}
|
|
|
|
func (c *commandVolumeCopy) Do(args []string, commandEnv *CommandEnv, writer io.Writer) (err error) {
|
|
|
|
volCopyCommand := flag.NewFlagSet(c.Name(), flag.ContinueOnError)
|
|
volumeIdInt := volCopyCommand.Int("volumeId", 0, "the volume id")
|
|
sourceNodeStr := volCopyCommand.String("source", "", "the source volume server <host>:<port>")
|
|
targetNodeStr := volCopyCommand.String("target", "", "the target volume server <host>:<port>")
|
|
noLock := volCopyCommand.Bool("noLock", false, "do not lock the admin shell at one's own risk")
|
|
if err = volCopyCommand.Parse(args); err != nil {
|
|
return err
|
|
}
|
|
|
|
if *noLock {
|
|
commandEnv.noLock = true
|
|
} else if err = commandEnv.confirmIsLocked(args); err != nil {
|
|
return
|
|
}
|
|
|
|
sourceVolumeServer, targetVolumeServer := pb.ServerAddress(*sourceNodeStr), pb.ServerAddress(*targetNodeStr)
|
|
|
|
volumeId := needle.VolumeId(*volumeIdInt)
|
|
|
|
if sourceVolumeServer == targetVolumeServer {
|
|
return fmt.Errorf("source and target volume servers are the same!")
|
|
}
|
|
|
|
_, err = copyVolume(context.Background(), commandEnv.option.GrpcDialOption, writer, volumeId, sourceVolumeServer, targetVolumeServer, "", 0, true)
|
|
return
|
|
}
|