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>
70 lines
1.9 KiB
Go
70 lines
1.9 KiB
Go
package shell
|
|
|
|
import (
|
|
"context"
|
|
"flag"
|
|
"fmt"
|
|
"io"
|
|
|
|
"github.com/seaweedfs/seaweedfs/weed/pb/mount_pb"
|
|
"github.com/seaweedfs/seaweedfs/weed/util"
|
|
"google.golang.org/grpc"
|
|
"google.golang.org/grpc/credentials/insecure"
|
|
_ "google.golang.org/grpc/resolver/passthrough"
|
|
)
|
|
|
|
func init() {
|
|
Commands = append(Commands, &commandMountConfigure{})
|
|
}
|
|
|
|
type commandMountConfigure struct {
|
|
}
|
|
|
|
func (c *commandMountConfigure) Name() string {
|
|
return "mount.configure"
|
|
}
|
|
|
|
func (c *commandMountConfigure) Help() string {
|
|
return `configure the mount on current server
|
|
|
|
mount.configure -dir=<mount_directory>
|
|
|
|
This command connects with local mount via unix socket, so it can only run locally.
|
|
The "mount_directory" value needs to be exactly the same as how mount was started in "weed mount -dir=<mount_directory>"
|
|
|
|
`
|
|
}
|
|
|
|
func (c *commandMountConfigure) HasTag(CommandTag) bool {
|
|
return false
|
|
}
|
|
|
|
func (c *commandMountConfigure) Do(args []string, commandEnv *CommandEnv, writer io.Writer) (err error) {
|
|
|
|
mountConfigureCommand := flag.NewFlagSet(c.Name(), flag.ContinueOnError)
|
|
mountDir := mountConfigureCommand.String("dir", "", "the mount directory same as how \"weed mount -dir=<mount_directory>\" was started")
|
|
mountQuota := mountConfigureCommand.Int("quotaMB", 0, "the quota in MB")
|
|
if err = mountConfigureCommand.Parse(args); err != nil {
|
|
return err
|
|
}
|
|
|
|
mountDirHash := util.HashToInt32([]byte(*mountDir))
|
|
if mountDirHash < 0 {
|
|
mountDirHash = -mountDirHash
|
|
}
|
|
localSocket := fmt.Sprintf("/tmp/seaweedfs-mount-%d.sock", mountDirHash)
|
|
|
|
clientConn, err := grpc.NewClient("passthrough:///unix://"+localSocket, grpc.WithTransportCredentials(insecure.NewCredentials()))
|
|
if err != nil {
|
|
return
|
|
}
|
|
defer clientConn.Close()
|
|
|
|
client := mount_pb.NewSeaweedMountClient(clientConn)
|
|
_, err = client.Configure(context.Background(), &mount_pb.ConfigureRequest{
|
|
CollectionCapacity: int64(*mountQuota) * 1024 * 1024,
|
|
})
|
|
|
|
return
|
|
}
|