From b3cde965719d0ee26345a8fd5edb55180e4a2c36 Mon Sep 17 00:00:00 2001 From: saicaca Date: Sun, 8 Oct 2023 22:57:34 +0800 Subject: [PATCH] [fix] fix code review issues --- .../status/volume/snapshot/snapshot.go | 20 +++++++++---------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/tools-v2/pkg/cli/command/curvebs/status/volume/snapshot/snapshot.go b/tools-v2/pkg/cli/command/curvebs/status/volume/snapshot/snapshot.go index 7b350b3c69..0687f558d3 100644 --- a/tools-v2/pkg/cli/command/curvebs/status/volume/snapshot/snapshot.go +++ b/tools-v2/pkg/cli/command/curvebs/status/volume/snapshot/snapshot.go @@ -60,9 +60,10 @@ type SnapshotInfoData struct { } const ( - SNAPSHOT_SUBURI = "/SnapshotCloneService" - ACTION_GET_FILE_SNAPSHOT_LIST = "GetFileSnapshotList" - ENTRIES_PER_TIME = 100 + SNAPSHOT_QUERY_LIMIT = 100 + SNAPSHOT_QUERY_INITIAL_OFFSET = 0 + SNAPSHOT_QUERY_CODE_SUCCESS = "0" + LENGTH_EMPTY = 0 ) const ( @@ -114,7 +115,7 @@ func NewVolumeSnapshotCommand() *SnapshotCommand { vsCmd := &SnapshotCommand{ FinalCurveCmd: basecmd.FinalCurveCmd{ Use: "snapshot", - Short: "create snapshot of curvebs volume", + Short: "show the snapshot status", }, } basecmd.NewFinalCurveCli(&vsCmd.FinalCurveCmd, vsCmd) @@ -142,13 +143,10 @@ func (sCmd *SnapshotCommand) RunCommand(cmd *cobra.Command, args []string) error cobrautil.QueryAction: cobrautil.ActionGetFileSnapshotList, cobrautil.QueryUser: sCmd.user, cobrautil.QueryFile: sCmd.filename, - cobrautil.QueryLimit: 100, - cobrautil.QueryOffset: 0, + cobrautil.QueryLimit: SNAPSHOT_QUERY_LIMIT, + cobrautil.QueryOffset: SNAPSHOT_QUERY_INITIAL_OFFSET, } count := make(map[int]int) - for _, s := range statusList { - count[s] = 0 - } for { subUri := cobrautil.NewSnapshotQuerySubUri(params) @@ -162,10 +160,10 @@ func (sCmd *SnapshotCommand) RunCommand(cmd *cobra.Command, args []string) error if err := json.Unmarshal([]byte(result), &resp); err != nil { return err } - if resp.Code != "0" { + if resp.Code != SNAPSHOT_QUERY_CODE_SUCCESS { return fmt.Errorf("get clone list fail, error code: %s", resp.Code) } - if len(resp.Snapshots) == 0 { + if len(resp.Snapshots) == LENGTH_EMPTY { break } for _, s := range resp.Snapshots {