Browse Source
Merge pull request #2986 from guo-sj/fix_return_value
fix return value
pull/2989/head
Chris Lu
3 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
2 additions and
2 deletions
-
weed/shell/command_fs_configure.go
-
weed/shell/command_volume_vacuum.go
|
@ -62,7 +62,7 @@ func (c *commandFsConfigure) Do(args []string, commandEnv *CommandEnv, writer io |
|
|
isDelete := fsConfigureCommand.Bool("delete", false, "delete the configuration by locationPrefix") |
|
|
isDelete := fsConfigureCommand.Bool("delete", false, "delete the configuration by locationPrefix") |
|
|
apply := fsConfigureCommand.Bool("apply", false, "update and apply filer configuration") |
|
|
apply := fsConfigureCommand.Bool("apply", false, "update and apply filer configuration") |
|
|
if err = fsConfigureCommand.Parse(args); err != nil { |
|
|
if err = fsConfigureCommand.Parse(args); err != nil { |
|
|
return err |
|
|
|
|
|
|
|
|
return nil |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
fc, err := filer.ReadFilerConf(commandEnv.option.FilerAddress, commandEnv.option.GrpcDialOption, commandEnv.MasterClient) |
|
|
fc, err := filer.ReadFilerConf(commandEnv.option.FilerAddress, commandEnv.option.GrpcDialOption, commandEnv.MasterClient) |
|
|
|
@ -34,7 +34,7 @@ func (c *commandVacuum) Do(args []string, commandEnv *CommandEnv, writer io.Writ |
|
|
collection := volumeVacuumCommand.String("collection", "", "vacuum this collection") |
|
|
collection := volumeVacuumCommand.String("collection", "", "vacuum this collection") |
|
|
volumeId := volumeVacuumCommand.Uint("volumeId", 0, "the volume id") |
|
|
volumeId := volumeVacuumCommand.Uint("volumeId", 0, "the volume id") |
|
|
if err = volumeVacuumCommand.Parse(args); err != nil { |
|
|
if err = volumeVacuumCommand.Parse(args); err != nil { |
|
|
return |
|
|
|
|
|
|
|
|
return nil |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
if err = commandEnv.confirmIsLocked(args); err != nil { |
|
|
if err = commandEnv.confirmIsLocked(args); err != nil { |
|
|