Skip to content

Commit d8a1137

Browse files
montaguelhzWine93
authored andcommitted
[fix]tools-v2: panic when show cluster status
Signed-off-by: montaguelhz <[email protected]>
1 parent 5ee6f03 commit d8a1137

File tree

5 files changed

+22
-6
lines changed

5 files changed

+22
-6
lines changed

tools-v2/internal/error/error.go

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -379,15 +379,12 @@ var (
379379
ErrBsListZone = func() *CmdError {
380380
return NewInternalCmdError(39, "list zone fail. the error is %s")
381381
}
382-
383382
ErrBsDeleteFile = func() *CmdError {
384383
return NewInternalCmdError(40, "delete file fail. the error is %s")
385384
}
386-
387385
ErrRespTypeNoExpected = func() *CmdError {
388386
return NewInternalCmdError(41, "the response type is not as expected, should be: %s")
389387
}
390-
391388
ErrGetPeer = func() *CmdError {
392389
return NewInternalCmdError(42, "invalid peer args, err: %s")
393390
}
@@ -487,6 +484,21 @@ var (
487484
ErrBsGetFormatStatus = func() *CmdError {
488485
return NewInternalCmdError(75, "get format status fail, err: %s")
489486
}
487+
ErrBsGetSegmentInfo = func() *CmdError {
488+
return NewInternalCmdError(76, "get segment info fail, err: %s")
489+
}
490+
ErrBsGetChunkHash = func() *CmdError {
491+
return NewInternalCmdError(77, "get chunk hash fail, err: %s")
492+
}
493+
ErrBsListSnaspshot = func(requestId, code, message string) *CmdError {
494+
return NewInternalCmdError(78, fmt.Sprintf("list snapshot fail, requestId: %s, code: %s, message: %s", requestId, code, message))
495+
}
496+
ErrBsGetCloneRecover = func() *CmdError {
497+
return NewInternalCmdError(79, "get clone-recover fail, err: %s")
498+
}
499+
ErrInvalidMetaServerAddr = func() *CmdError {
500+
return NewInternalCmdError(80, "invalid metaserver external addr: %s")
501+
}
490502

491503
// http error
492504
ErrHttpUnreadableResult = func() *CmdError {

tools-v2/pkg/cli/command/curvefs/status/copyset/copyset.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,11 +74,10 @@ func (cCmd *CopysetCommand) Init(cmd *cobra.Command, args []string) error {
7474
poolIdVec = append(poolIdVec, fmt.Sprintf("%d", info.GetPoolId()))
7575
}
7676
if len(copysetIdVec) == 0 {
77-
var err error
7877
cCmd.Error = cmderror.ErrSuccess()
7978
cCmd.Result = "No copyset found"
8079
cCmd.health = cobrautil.HEALTH_OK
81-
return err
80+
return nil
8281
}
8382
copysetIds := strings.Join(copysetIdVec, ",")
8483
poolIds := strings.Join(poolIdVec, ",")

tools-v2/pkg/cli/command/curvefs/status/etcd/etcd.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ func (eCmd *EtcdCommand) Init(cmd *cobra.Command, args []string) error {
8383
// set main addr
8484
etcdAddrs, addrErr := config.GetFsEtcdAddrSlice(eCmd.Cmd)
8585
if addrErr.TypeCode() != cmderror.CODE_SUCCESS {
86+
eCmd.Error = addrErr
8687
return fmt.Errorf(addrErr.Message)
8788
}
8889
for _, addr := range etcdAddrs {

tools-v2/pkg/cli/command/curvefs/status/mds/mds.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,12 +76,14 @@ func (mCmd *MdsCommand) Init(cmd *cobra.Command, args []string) error {
7676
// set main addr
7777
mainAddrs, addrErr := config.GetFsMdsAddrSlice(mCmd.Cmd)
7878
if addrErr.TypeCode() != cmderror.CODE_SUCCESS {
79+
mCmd.Error = addrErr
7980
return fmt.Errorf(addrErr.Message)
8081
}
8182

8283
// set dummy addr
8384
dummyAddrs, addrErr := config.GetFsMdsDummyAddrSlice(mCmd.Cmd)
8485
if addrErr.TypeCode() != cmderror.CODE_SUCCESS {
86+
mCmd.Error = addrErr
8587
return fmt.Errorf(addrErr.Message)
8688
}
8789
for _, addr := range dummyAddrs {

tools-v2/pkg/cli/command/curvefs/status/metaserver/metaserver.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,9 @@ func (mCmd *MetaserverCommand) Init(cmd *cobra.Command, args []string) error {
8888

8989
for i, addr := range externalAddrs {
9090
if !config.IsValidAddr(addr) {
91-
return fmt.Errorf("invalid metaserver external addr: %s", addr)
91+
mCmd.Error = cmderror.ErrInvalidMetaServerAddr()
92+
mCmd.Error.Format(addr)
93+
return fmt.Errorf(mCmd.Error.Message)
9294
}
9395

9496
// set metrics

0 commit comments

Comments
 (0)