Skip to content

Commit

Permalink
fix: typo
Browse files Browse the repository at this point in the history 
Signed-off-by: Sindweller <[email protected]>
  • Loading branch information
@Sindweller
Sindweller committed May 18, 2023
1 parent de8e670 commit 1da337b
Show file tree
Hide file tree
Showing 5 changed files with 43 additions and 50 deletions.
18 changes: 9 additions & 9 deletions tools-v2/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -934,15 +934,15 @@ curve bs list chunkserver
Output:

```bash
+---------------+----------+-----------+------+-----------+------------+------------+-----------------------------------------------+--------------+------------+-----------------------+------------+
| CHUNKSERVERID | DISKTYPE | HOSTIP | PORT | RSSTATUS | DISKSTATE | COPYSETNUM | MOUNTPOINT | DISKCAPACITY | DISKUSED | UNHEALTHYCOPYSETRATIO | EXTERNALIP |
+---------------+----------+-----------+------+-----------+------------+------------+-----------------------------------------------+--------------+------------+-----------------------+------------+
| 3 | nvme | 127.0.0.1 | 8200 | READWRITE | DISKNORMAL | 100 | local:///curvebs/playground/chunkserver0/data | 42140479488 | 9465290752 | 0 % | 127.0.0.1 |
+---------------+ + +------+ + +------------+-----------------------------------------------+--------------+------------+-----------------------+ +
| 1 | | | 8201 | | | 100 | local:///curvebs/playground/chunkserver1/data | 42140479488 | 9465290752 | 0 % | |
+---------------+ + +------+ + +------------+-----------------------------------------------+--------------+------------+-----------------------+ +
| 2 | | | 8202 | | | 100 | local:///curvebs/playground/chunkserver2/data | 42140479488 | 9465290752 | 0 % | |
+---------------+----------+-----------+------+-----------+------------+------------+-----------------------------------------------+--------------+------------+-----------------------+------------+
+----+------+-----------+------+-----------+------------+------------+-----------------------------------------------+--------------+-------------+------------------+-----------+
| ID | TYPE | IP | PORT | RWSTATUS | DISKSTATE | COPYSETNUM | MOUNTPOINT | DISKCAPACITY | DISKUSED | UNHEALTHYCOPYSET | EXTADDR |
+----+------+-----------+------+-----------+------------+------------+-----------------------------------------------+--------------+-------------+------------------+-----------+
| 1 | nvme | 127.0.0.1 | 8201 | READWRITE | DISKNORMAL | 100 | local:///curvebs/playground/chunkserver1/data | 39 GiB | 42140479488 | 0 % | 127.0.0.1 |
+----+ + +------+ + +------------+-----------------------------------------------+--------------+-------------+------------------+ +
| 2 | | | 8202 | | | 100 | local:///curvebs/playground/chunkserver2/data | 39 GiB | 42140479488 | 0 % | |
+----+ + +------+ + +------------+-----------------------------------------------+--------------+-------------+------------------+ +
| 3 | | | 8200 | | | 100 | local:///curvebs/playground/chunkserver0/data | 39 GiB | 42140479488 | 0 % | |
+----+------+-----------+------+-----------+------------+------------+-----------------------------------------------+--------------+-------------+------------------+-----------+
```

### clean-recycle
Expand Down
14 changes: 5 additions & 9 deletions tools-v2/pkg/cli/command/curvebs/list/chunkserver/chunkserver.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,10 +91,10 @@ func (pCmd *ChunkServerCommand) AddFlags() {
config.AddRpcTimeoutFlag(pCmd.Cmd)
config.AddBsUserOptionFlag(pCmd.Cmd)
config.AddBsPasswordOptionFlag(pCmd.Cmd)
config.AddBSCheckCSAliveFlag(pCmd.Cmd)
config.AddBSCheckHealthFlag(pCmd.Cmd)
config.AddBSCSOfflineFlag(pCmd.Cmd)
config.AddBSCSUnhealthyFlag(pCmd.Cmd)
config.AddBSCheckCSAliveOptionFlag(pCmd.Cmd)
config.AddBSCheckHealthOptionFlag(pCmd.Cmd)
config.AddBSCSOfflineOptionFlag(pCmd.Cmd)
config.AddBSCSUnhealthyOptionFlag(pCmd.Cmd)
}

// Init implements basecmd.FinalCurveCmdFunc
Expand Down Expand Up @@ -184,7 +184,7 @@ func (pCmd *ChunkServerCommand) RunCommand(cmd *cobra.Command, args []string) er
config.AlignFlagsValue(pCmd.Cmd, copysetCmd.Cmd, []string{
config.RPCRETRYTIMES, config.RPCTIMEOUT, config.CURVEBS_MDSADDR,
})
copysetCmd.Cmd.Flags().Set(config.CURVEBS_CHUNK_SERVER_ID, strconv.FormatUint(uint64(csID), 10))
copysetCmd.Cmd.Flags().Set(config.CURVEBS_CHUNKSERVER_ID, strconv.FormatUint(uint64(csID), 10))
copysets, err := GetCopySetsInChunkServer(copysetCmd.Cmd)
if err.TypeCode() != cmderror.CODE_SUCCESS {
errors = append(errs, err)
Expand Down Expand Up @@ -251,10 +251,6 @@ func (pCmd *ChunkServerCommand) ResultPlainOutput() error {
return output.FinalCmdOutputPlain(&pCmd.FinalCurveCmd)
}

func (pCmd *ChunkServerCommand) CheckChunkServerOnline(csAddr string) bool {
return true
}

func ListChunkServerInfos(caller *cobra.Command) ([]*topology.ChunkServerInfo, *cmderror.CmdError) {
lCmd := NewListChunkServerCommand()
config.AlignFlagsValue(caller, lCmd.Cmd, []string{
Expand Down
4 changes: 2 additions & 2 deletions tools-v2/pkg/cli/command/curvebs/list/chunkserver/copyset.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ func (pCmd *CopySetCommand) Init(cmd *cobra.Command, args []string) error {

timeout := config.GetFlagDuration(pCmd.Cmd, config.RPCTIMEOUT)
retrytimes := config.GetFlagInt32(pCmd.Cmd, config.RPCRETRYTIMES)
strid, e := strconv.Atoi(config.GetBsFlagString(pCmd.Cmd, config.CURVEBS_CHUNK_SERVER_ID))
strid, e := strconv.Atoi(config.GetBsFlagString(pCmd.Cmd, config.CURVEBS_CHUNKSERVER_ID))
if e != nil {
return e
}
Expand Down Expand Up @@ -164,7 +164,7 @@ func GetCopySetsInChunkServer(caller *cobra.Command) ([]*common.CopysetInfo, *cm
getCopySetsCmd := NewGetCopySetsInCopySetCommand()
config.AlignFlagsValue(caller, getCopySetsCmd.Cmd, []string{
config.RPCRETRYTIMES, config.RPCTIMEOUT, config.CURVEBS_MDSADDR,
config.CURVEBS_CHUNK_SERVER_ID,
config.CURVEBS_CHUNKSERVER_ID,
})
getCopySetsCmd.Cmd.SilenceErrors = true
getCopySetsCmd.Cmd.SilenceUsage = true
Expand Down
2 changes: 1 addition & 1 deletion tools-v2/pkg/cli/command/curvebs/query/chunkserver/chunkserver_recover.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ func NewChunkServerRecoverStatusCommand() *cobra.Command {

func GetQueryChunkServerRecoverStatus(caller *cobra.Command) (map[uint32]bool, *cmderror.CmdError) {
getCmd := NewQueryChunkServerRecoverStatusCommand()
config.AlignFlagsValue(caller, getCmd.Cmd, []string{config.CURVEBS_MDSADDR, config.CUERVEBS_CHUNKSERVER_ID})
config.AlignFlagsValue(caller, getCmd.Cmd, []string{config.CURVEBS_MDSADDR, config.CURVEBS_CHUNKSERVER_ID})
getCmd.Cmd.SilenceErrors = true
getCmd.Cmd.SilenceUsage = true
getCmd.Cmd.SetArgs([]string{"--format", config.FORMAT_NOOUT})
Expand Down
55 changes: 26 additions & 29 deletions tools-v2/pkg/config/bs.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,14 +103,12 @@ const (
CURVEBS_SCAN = "scan"
VIPER_CURVEBS_SCAN = "curvebs.scan"
CURVEBS_DEFAULT_SCAN = true
CUERVEBS_CHUNKSERVER_ID = "chunkserverid"
CURVEBS_CHUNKSERVER_ID = "chunkserverid"
VIPER_CHUNKSERVER_ID = "curvebs.chunkserverid"
CURVEBS_DEFAULT_CHUNKSERVER_ID = "*"
CURVEBS_CHUNK_SERVER_ID = "chunkserverid"
VIPER_CURVEBS_CHUNK_SERVER_ID = "curvebs.chunkserverid"
CURVEBS_CHECK_CSALIVE = "checkCSAlive"
VIPER_CURVEBS_CHECK_CSALIVE = "curvebs.checkCSAlive"
CURVEBS_CHECK_HEALTH = "checkHealth"
CURVEBS_CHECK_CSALIVE = "checkalive"
VIPER_CURVEBS_CHECK_CSALIVE = "curvebs.checkalive"
CURVEBS_CHECK_HEALTH = "checkhealth"
VIPER_CURVEBS_CHECK_HEALTH = "curvebs.checkHealth"
CURVEBS_CS_OFFLINE = "offline"
VIPER_CURVEBS_CS_OFFLINE = "curvebs.offline"
Expand Down Expand Up @@ -152,8 +150,7 @@ var (
CURVEBS_SNAPSHOTADDR: VIPER_CURVEBS_SNAPSHOTADDR,
CURVEBS_SNAPSHOTDUMMYADDR: VIPER_CURVEBS_SNAPSHOTDUMMYADDR,
CURVEBS_SCAN: VIPER_CURVEBS_SCAN,
CUERVEBS_CHUNKSERVER_ID: VIPER_CHUNKSERVER_ID,
CURVEBS_CHUNK_SERVER_ID: VIPER_CURVEBS_CHUNK_SERVER_ID,
CURVEBS_CHUNKSERVER_ID: VIPER_CHUNKSERVER_ID,
CURVEBS_CHECK_CSALIVE: VIPER_CURVEBS_CHECK_CSALIVE,
CURVEBS_CHECK_HEALTH: VIPER_CURVEBS_CHECK_HEALTH,
CURVEBS_CS_OFFLINE: VIPER_CURVEBS_CS_OFFLINE,
Expand All @@ -162,20 +159,20 @@ var (

BSFLAG2DEFAULT = map[string]interface{}{
// bs
CURVEBS_USER: CURVEBS_DEFAULT_USER,
CURVEBS_PASSWORD: CURVEBS_DEFAULT_PASSWORD,
CURVEBS_SIZE: CURVEBS_DEFAULT_SIZE,
CURVEBS_STRIPE_UNIT: CURVEBS_DEFAULT_STRIPE_UNIT,
CURVEBS_STRIPE_COUNT: CURVEBS_DEFAULT_STRIPE_COUNT,
CURVEBS_BURST: CURVEBS_DEFAULT_BURST,
CURVEBS_BURST_LENGTH: CURVEBS_DEFAULT_BURST_LENGTH,
CURVEBS_PATH: CURVEBS_DEFAULT_PATH,
CURVEBS_FORCE: CURVEBS_DEFAULT_FORCE,
CURVEBS_MARGIN: CURVEBS_DEFAULT_MARGIN,
CURVEBS_OP: CURVEBS_DEFAULT_OP,
CURVEBS_CHECK_TIME: CURVEBS_DEFAULT_CHECK_TIME,
CURVEBS_SCAN: CURVEBS_DEFAULT_SCAN,
CUERVEBS_CHUNKSERVER_ID: CURVEBS_DEFAULT_CHUNKSERVER_ID,
CURVEBS_USER: CURVEBS_DEFAULT_USER,
CURVEBS_PASSWORD: CURVEBS_DEFAULT_PASSWORD,
CURVEBS_SIZE: CURVEBS_DEFAULT_SIZE,
CURVEBS_STRIPE_UNIT: CURVEBS_DEFAULT_STRIPE_UNIT,
CURVEBS_STRIPE_COUNT: CURVEBS_DEFAULT_STRIPE_COUNT,
CURVEBS_BURST: CURVEBS_DEFAULT_BURST,
CURVEBS_BURST_LENGTH: CURVEBS_DEFAULT_BURST_LENGTH,
CURVEBS_PATH: CURVEBS_DEFAULT_PATH,
CURVEBS_FORCE: CURVEBS_DEFAULT_FORCE,
CURVEBS_MARGIN: CURVEBS_DEFAULT_MARGIN,
CURVEBS_OP: CURVEBS_DEFAULT_OP,
CURVEBS_CHECK_TIME: CURVEBS_DEFAULT_CHECK_TIME,
CURVEBS_SCAN: CURVEBS_DEFAULT_SCAN,
CURVEBS_CHUNKSERVER_ID: CURVEBS_DEFAULT_CHUNKSERVER_ID,
}
)

Expand Down Expand Up @@ -413,7 +410,7 @@ func AddBsCheckTimeOptionFlag(cmd *cobra.Command) {
}

func AddBsChunkServerIdOptionFlag(cmd *cobra.Command) {
AddBsStringOptionFlag(cmd, CUERVEBS_CHUNKSERVER_ID, "chunkserver id")
AddBsStringOptionFlag(cmd, CURVEBS_CHUNKSERVER_ID, "chunkserver id")
}

// marigin
Expand Down Expand Up @@ -485,22 +482,22 @@ func AddBsOpRequiredFlag(cmd *cobra.Command) {
}

func AddBSChunkServerIdFlag(cmd *cobra.Command) {
AddBsUint32RequiredFlag(cmd, CURVEBS_CHUNK_SERVER_ID, "chunkserver id")
AddBsUint32RequiredFlag(cmd, CURVEBS_CHUNKSERVER_ID, "chunkserver id")
}

func AddBSCheckCSAliveFlag(cmd *cobra.Command) {
func AddBSCheckCSAliveOptionFlag(cmd *cobra.Command) {
AddBsBoolOptionFlag(cmd, CURVEBS_CHECK_CSALIVE, "check chunkserver alive")
}

func AddBSCheckHealthFlag(cmd *cobra.Command) {
func AddBSCheckHealthOptionFlag(cmd *cobra.Command) {
AddBsBoolOptionFlag(cmd, CURVEBS_CHECK_HEALTH, "check chunkserver health")
}

func AddBSCSOfflineFlag(cmd *cobra.Command) {
func AddBSCSOfflineOptionFlag(cmd *cobra.Command) {
AddBsBoolOptionFlag(cmd, CURVEBS_CS_OFFLINE, "offline")
}

func AddBSCSUnhealthyFlag(cmd *cobra.Command) {
func AddBSCSUnhealthyOptionFlag(cmd *cobra.Command) {
AddBsBoolOptionFlag(cmd, CURVEBS_CS_UNHEALTHY, "unhealthy")
}

Expand Down Expand Up @@ -659,7 +656,7 @@ func GetBsExpireTime(cmd *cobra.Command) time.Duration {
}

func GetBsChunkServerId(cmd *cobra.Command) []uint32 {
chunkserveridStr := GetBsFlagString(cmd, CUERVEBS_CHUNKSERVER_ID)
chunkserveridStr := GetBsFlagString(cmd, CURVEBS_CHUNKSERVER_ID)
if chunkserveridStr == "" || chunkserveridStr == "*" {
return []uint32{}
}
Expand Down

0 comments on commit 1da337b

Please sign in to comment.