-
Notifications
You must be signed in to change notification settings - Fork 525
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.
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
[feat]tools-v2: add bs recover volume #2918
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,70 @@ | ||
package recover | ||
|
||
import ( | ||
cmderror "github.com/opencurve/curve/tools-v2/internal/error" | ||
cobrautil "github.com/opencurve/curve/tools-v2/internal/utils" | ||
basecmd "github.com/opencurve/curve/tools-v2/pkg/cli/command" | ||
file "github.com/opencurve/curve/tools-v2/pkg/cli/command/curvebs/recover/volume" | ||
"github.com/opencurve/curve/tools-v2/pkg/config" | ||
"github.com/opencurve/curve/tools-v2/pkg/output" | ||
"github.com/spf13/cobra" | ||
) | ||
|
||
const ( | ||
RecoverExample = `curve bs recover volume --path /curvebs-volume-path | ||
--user username [--password password] [--fileid fileid]` | ||
) | ||
|
||
// RecoverCommand | ||
type RecoverCommand struct { | ||
basecmd.FinalCurveCmd | ||
} | ||
|
||
var _ basecmd.FinalCurveCmdFunc = (*RecoverCommand)(nil) // check interface | ||
|
||
// new RecoverCommand function | ||
func NewRecoverCommand() *cobra.Command { | ||
rCmd := &RecoverCommand{ | ||
FinalCurveCmd: basecmd.FinalCurveCmd{ | ||
Use: "curve bs recover volume", | ||
Short: "recover volumes from the RecycleBin", | ||
Example: RecoverExample, | ||
}, | ||
} | ||
return basecmd.NewFinalCurveCli(&rCmd.FinalCurveCmd, rCmd) | ||
} | ||
|
||
func (rCmd *RecoverCommand) Init(cmd *cobra.Command, args []string) error { | ||
header := []string{cobrautil.ROW_RESULT} | ||
rCmd.SetHeader(header) | ||
rCmd.TableNew.SetAutoMergeCellsByColumnIndex(cobrautil.GetIndexSlice( | ||
rCmd.Header, header, | ||
)) | ||
return nil | ||
} | ||
|
||
func (rCmd *RecoverCommand) RunCommand(cmd *cobra.Command, args []string) error { | ||
rCmd.Result, rCmd.Error = file.RecoverFile(rCmd.Cmd) | ||
if rCmd.Error.TypeCode() != cmderror.CODE_SUCCESS { | ||
return rCmd.Error.ToError() | ||
} | ||
rCmd.TableNew.Append([]string{rCmd.Error.Message}) | ||
return nil | ||
} | ||
|
||
func (rCmd *RecoverCommand) Print(cmd *cobra.Command, args []string) error { | ||
return output.FinalCmdOutput(&rCmd.FinalCurveCmd, rCmd) | ||
} | ||
|
||
func (rCmd *RecoverCommand) ResultPlainOutput() error { | ||
return output.FinalCmdOutputPlain(&rCmd.FinalCurveCmd) | ||
} | ||
|
||
func (rCmd *RecoverCommand) AddFlags() { | ||
config.AddRpcRetryTimesFlag(rCmd.Cmd) | ||
config.AddRpcTimeoutFlag(rCmd.Cmd) | ||
config.AddBsMdsFlagOption(rCmd.Cmd) | ||
config.AddBsPathOptionFlag(rCmd.Cmd) | ||
config.AddBsUserOptionFlag(rCmd.Cmd) | ||
config.AddBsPasswordOptionFlag(rCmd.Cmd) | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,133 @@ | ||
package file | ||
|
||
import ( | ||
"context" | ||
|
||
"github.com/spf13/cobra" | ||
"github.com/spf13/viper" | ||
"google.golang.org/grpc" | ||
|
||
cmderror "github.com/opencurve/curve/tools-v2/internal/error" | ||
cobrautil "github.com/opencurve/curve/tools-v2/internal/utils" | ||
basecmd "github.com/opencurve/curve/tools-v2/pkg/cli/command" | ||
"github.com/opencurve/curve/tools-v2/pkg/config" | ||
"github.com/opencurve/curve/tools-v2/pkg/output" | ||
"github.com/opencurve/curve/tools-v2/proto/proto/nameserver2" | ||
) | ||
|
||
type RecoverCertainFileRpc struct { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Named the same as RPC |
||
Info *basecmd.Rpc | ||
Request *nameserver2.RecoverFileRequest | ||
mdsClient nameserver2.CurveFSServiceClient | ||
} | ||
|
||
var _ basecmd.RpcFunc = (*RecoverCertainFileRpc)(nil) | ||
|
||
func (gRpc *RecoverCertainFileRpc) NewRpcClient(cc grpc.ClientConnInterface) { | ||
gRpc.mdsClient = nameserver2.NewCurveFSServiceClient(cc) | ||
} | ||
|
||
func (gRpc *RecoverCertainFileRpc) Stub_Func(ctx context.Context) (interface{}, error) { | ||
return gRpc.mdsClient.RecoverFile(ctx, gRpc.Request) | ||
} | ||
|
||
type RecoverCommand struct { | ||
basecmd.FinalCurveCmd | ||
Rpc *RecoverCertainFileRpc | ||
Response *nameserver2.RecoverFileResponse | ||
} | ||
|
||
var _ basecmd.FinalCurveCmdFunc = (*RecoverCommand)(nil) | ||
|
||
func (recoverCommand *RecoverCommand) Init(cmd *cobra.Command, args []string) error { | ||
mdsAddrs, err := config.GetBsMdsAddrSlice(recoverCommand.Cmd) | ||
if err.TypeCode() != cmderror.CODE_SUCCESS { | ||
return err.ToError() | ||
} | ||
//get the default timeout and retrytimes | ||
timeout := config.GetFlagDuration(recoverCommand.Cmd, config.RPCTIMEOUT) | ||
retrytimes := config.GetFlagInt32(recoverCommand.Cmd, config.RPCRETRYTIMES) | ||
path := config.GetBsFlagString(recoverCommand.Cmd, config.CURVEBS_PATH) | ||
username := config.GetBsFlagString(recoverCommand.Cmd, config.CURVEBS_USER) | ||
password := config.GetBsFlagString(recoverCommand.Cmd, config.CURVEBS_PASSWORD) | ||
date, errDat := cobrautil.GetTimeofDayUs() | ||
if errDat.TypeCode() != cmderror.CODE_SUCCESS { | ||
return errDat.ToError() | ||
} | ||
|
||
recoverRequest := nameserver2.RecoverFileRequest{ | ||
FileName: &path, | ||
Owner: &username, | ||
Date: &date, | ||
} | ||
|
||
if username == viper.GetString(config.VIPER_CURVEBS_USER) && len(password) != 0 { | ||
strSig := cobrautil.GetString2Signature(date, username) | ||
sig := cobrautil.CalcString2Signature(strSig, password) | ||
recoverRequest.Signature = &sig | ||
} | ||
recoverCommand.Rpc = &RecoverCertainFileRpc{ | ||
Info: basecmd.NewRpc(mdsAddrs, timeout, retrytimes, "recoverFile"), | ||
Request: &recoverRequest, | ||
} | ||
return nil | ||
} | ||
|
||
func (recoverCommand *RecoverCommand) AddFlags() { | ||
config.AddRpcTimeoutFlag(recoverCommand.Cmd) | ||
config.AddRpcRetryTimesFlag(recoverCommand.Cmd) | ||
config.AddBsMdsFlagOption(recoverCommand.Cmd) | ||
config.AddBsPathRequiredFlag(recoverCommand.Cmd) | ||
config.AddBsUserOptionFlag(recoverCommand.Cmd) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. this should be required |
||
config.AddBsPasswordOptionFlag(recoverCommand.Cmd) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. flag |
||
} | ||
|
||
func (recoverCommand *RecoverCommand) RunCommand(cmd *cobra.Command, args []string) error { | ||
result, err := basecmd.GetRpcResponse(recoverCommand.Rpc.Info, recoverCommand.Rpc) | ||
if err.TypeCode() != cmderror.CODE_SUCCESS { | ||
recoverCommand.Error = err | ||
recoverCommand.Result = result | ||
return err.ToError() | ||
} | ||
recoverCommand.Response = result.(*nameserver2.RecoverFileResponse) | ||
if recoverCommand.Response.GetStatusCode() != nameserver2.StatusCode_kOK { | ||
recoverCommand.Error = cmderror.ErrBsQueryChunkServerRecoverStatus() | ||
recoverCommand.Result = result | ||
return recoverCommand.Error.ToError() | ||
} | ||
return nil | ||
} | ||
|
||
func (recoverCommand *RecoverCommand) Print(cmd *cobra.Command, args []string) error { | ||
return output.FinalCmdOutput(&recoverCommand.FinalCurveCmd, recoverCommand) | ||
} | ||
|
||
func (recoverCommand *RecoverCommand) ResultPlainOutput() error { | ||
return output.FinalCmdOutputPlain(&recoverCommand.FinalCurveCmd) | ||
} | ||
|
||
func RecoverFile(caller *cobra.Command) (*nameserver2.RecoverFileResponse, *cmderror.CmdError) { | ||
rCmd := NewRecoverFileCommand() | ||
config.AlignFlagsValue(caller, rCmd.Cmd, []string{ | ||
config.RPCRETRYTIMES, config.RPCTIMEOUT, config.CURVEBS_MDSADDR, | ||
config.CURVEBS_PATH, config.CURVEBS_USER, config.CURVEBS_PASSWORD, | ||
}) | ||
rCmd.Cmd.SilenceErrors = true | ||
rCmd.Cmd.SilenceUsage = true | ||
rCmd.Cmd.SetArgs([]string{"--format", config.FORMAT_NOOUT}) | ||
err := rCmd.Cmd.Execute() | ||
if err != nil { | ||
retErr := cmderror.ErrBsQueryChunkServerRecoverStatus() | ||
retErr.Format(err.Error()) | ||
return rCmd.Response, retErr | ||
} | ||
return rCmd.Response, cmderror.Success() | ||
} | ||
|
||
func NewRecoverFileCommand() *RecoverCommand { | ||
RecoverCommand := &RecoverCommand{ | ||
FinalCurveCmd: basecmd.FinalCurveCmd{}, | ||
} | ||
basecmd.NewFinalCurveCli(&RecoverCommand.FinalCurveCmd, RecoverCommand) | ||
return RecoverCommand | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This command is a middle command. You can add sub command in middle command. You can refer to tools-v2/pkg/cli/command/curvebs/update/update.go.