Skip to content
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.

Sign up for GitHub

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

Jump to bottom

[refactor]tools-v2: optimize duplicate code #2534

Merged
merged 1 commit into from
Jun 19, 2023
Merged

[refactor]tools-v2: optimize duplicate code #2534

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 5 additions & 16 deletions tools-v2/internal/error/error.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -444,23 +444,20 @@ var (
ErrBsListChunkServer = func() *CmdError {
return NewInternalCmdError(61, "list chunkserver fail, err: %s")
}
ErrBsGetCopysetInChunkServer = func() *CmdError {
return NewInternalCmdError(62, "get copyset in chunkserver fail, err: %s")
}
ErrBsGetChunkInfo = func() *CmdError {
return NewInternalCmdError(63, "get chunk info fail, err: %s")
return NewInternalCmdError(62, "get chunk info fail, err: %s")
}
ErrBsGetUnavailCopysets = func() *CmdError {
return NewInternalCmdError(64, "get unavail copysets fail, err: %s")
return NewInternalCmdError(63, "get unavail copysets fail, err: %s")
}
ErrBsGetScanStatus = func() *CmdError {
return NewInternalCmdError(65, "query scan-status fail, err: %s")
return NewInternalCmdError(64, "query scan-status fail, err: %s")
}
ErrBsListScanStatus = func() *CmdError {
return NewInternalCmdError(66, "list scan-status fail, err: %s")
return NewInternalCmdError(65, "list scan-status fail, err: %s")
}
ErrBsListOfflineChunkServer = func() *CmdError {
return NewInternalCmdError(67, "list offline chunkserver fail, err: %s")
return NewInternalCmdError(66, "list offline chunkserver fail, err: %s")
}

// http error
Expand Down Expand Up @@ -675,18 +672,10 @@ var (
message := fmt.Sprintf("Rpc[ListPoolZone] faild status code: %s", statuscode.String())
return NewInternalCmdError(int(statuscode), message)
}
ErrBsGetChunkserverInClusterRpc = func(statuscode bs_topo_statuscode.TopoStatusCode) *CmdError {
message := fmt.Sprintf("Rpc[GetChunkserverInCluster] faild status code: %s", statuscode.String())
return NewInternalCmdError(int(statuscode), message)
}
ErrBsSetCopysetAvailFlagRpc = func(statuscode bs_topo_statuscode.TopoStatusCode) *CmdError {
message := fmt.Sprintf("Rpc[SetCopysetAvailFlag] faild status code: %s", statuscode.String())
return NewInternalCmdError(int(statuscode), message)
}
ErrBsGetCopysetInChunkServerRpc = func(statuscode bs_topo_statuscode.TopoStatusCode) *CmdError {
message := fmt.Sprintf("Rpc[GetCopySetsInChunkServer] faild status code: %s", statuscode.String())
return NewInternalCmdError(int(statuscode), message)
}

// bs
ErrCreateBsTopology = func(statusCode bs_topo_statuscode.TopoStatusCode, topoType string, name string) *CmdError {
Expand Down
163 changes: 0 additions & 163 deletions tools-v2/pkg/cli/command/curvebs/list/chunkserver/copyset_by_host.go
View file
Open in desktop

This file was deleted.

78 changes: 27 additions & 51 deletions tools-v2/pkg/cli/command/curvebs/update/copyset/availflag/availflag.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,9 @@ 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"
copyset2 "github.com/opencurve/curve/tools-v2/pkg/cli/command/curvebs/check/copyset"
"github.com/opencurve/curve/tools-v2/pkg/cli/command/curvebs/check/copyset"
"github.com/opencurve/curve/tools-v2/pkg/cli/command/curvebs/list/chunkserver"
"github.com/opencurve/curve/tools-v2/pkg/cli/command/curvebs/list/unavailcopysets"
"github.com/opencurve/curve/tools-v2/pkg/cli/command/curvebs/query/chunk"
"github.com/opencurve/curve/tools-v2/pkg/config"
"github.com/opencurve/curve/tools-v2/pkg/output"
"github.com/opencurve/curve/tools-v2/proto/proto/common"
Expand Down Expand Up @@ -114,76 +113,53 @@ func (cCmd *CopysetAvailflagCommand) Init(cmd *cobra.Command, args []string) err
return err.ToError()
}
} else {
// list chunkserver
chunkserverInfos, errCmd := chunkserver.GetChunkServerInCluster(cCmd.Cmd)
offlineChunkServer, errCmd := chunkserver.ListOfflineChunkServer(cCmd.Cmd)
if errCmd.TypeCode() != cmderror.CODE_SUCCESS {
return errCmd.ToError()
}

// check chunkserver offline
config.AddBsCopysetIdSliceRequiredFlag(cCmd.Cmd)
config.AddBsLogicalPoolIdSliceRequiredFlag(cCmd.Cmd)
config.AddBsChunkIdSliceRequiredFlag(cCmd.Cmd)
config.AddBsChunkServerAddressSliceRequiredFlag(cCmd.Cmd)
for _, info := range chunkserverInfos {
address := fmt.Sprintf("%s:%d", *info.HostIp, *info.Port)
cCmd.Cmd.ParseFlags([]string{
fmt.Sprintf("--%s", config.CURVEBS_LOGIC_POOL_ID), "1",
fmt.Sprintf("--%s", config.CURVEBS_COPYSET_ID), "1",
fmt.Sprintf("--%s", config.CURVEBS_CHUNK_ID), "1",
fmt.Sprintf("--%s", config.CURVEBS_CHUNKSERVER_ADDRESS), address,
})
}
addr2Chunk, errCmd := chunk.GetChunkInfo(cCmd.Cmd)
if errCmd.TypeCode() != cmderror.CODE_SUCCESS {
return errCmd.ToError()
}
var offlineChunkServer []string
for addr, info := range *addr2Chunk {
if info == nil {
offlineChunkServer = append(offlineChunkServer, addr)
}
}
if len(offlineChunkServer) > 0 {
cCmd.Cmd.ResetFlags()
cCmd.AddFlags()
config.AddBsChunkServerAddressSliceRequiredFlag(cCmd.Cmd)
config.AddFormatFlag(cCmd.Cmd)
cCmd.Cmd.SetArgs([]string{
fmt.Sprintf("--%s", config.CURVEBS_CHUNKSERVER_ADDRESS), strings.Join(offlineChunkServer, ","),
})
addr2Copysets, errCmd := chunkserver.GetCopySetsInChunkServerByHost(cCmd.Cmd)
if errCmd.TypeCode() != cmderror.CODE_SUCCESS {
return errCmd.ToError()
}
config.AddBsChunkServerIdFlag(cCmd.Cmd)
copysetIds := make([]string, 0)
logicalpoolids := make([]string, 0)
for _, infos := range *addr2Copysets {
for _, info := range infos {
copysetid := info.GetCopysetId()
logicalpoolid := info.GetLogicalPoolId()
addr2Copysets := make(map[uint64]*common.CopysetInfo)
for i, info := range offlineChunkServer {
if i > 0 {
cCmd.Cmd.Flag(config.CURVEBS_CHUNKSERVER_ID).Value.Set(fmt.Sprintf("%d", *info.ChunkServerID))
} else {
cCmd.Cmd.ParseFlags([]string{
fmt.Sprintf("--%s", config.CURVEBS_CHUNKSERVER_ID), fmt.Sprintf("%d", *info.ChunkServerID),
})
}
copysetInChunkserver, err := chunkserver.GetCopySetsInChunkServer(cCmd.Cmd)
if err.TypeCode() != cmderror.CODE_SUCCESS {
return err.ToError()
}
for i, copysetInfo := range copysetInChunkserver {
copysetid := copysetInfo.GetCopysetId()
logicalpoolid := copysetInfo.GetLogicalPoolId()
copysetIds = append(copysetIds, strconv.FormatUint(uint64(copysetid), 10))
logicalpoolids = append(logicalpoolids, strconv.FormatUint(uint64(logicalpoolid), 10))
key := cobrautil.GetCopysetKey(uint64(copysetInfo.GetLogicalPoolId()), uint64(copysetInfo.GetCopysetId()))
addr2Copysets[key] = copysetInChunkserver[i]
}
}

config.AddBsCopysetIdSliceRequiredFlag(cCmd.Cmd)
config.AddBsLogicalPoolIdSliceRequiredFlag(cCmd.Cmd)
cCmd.Cmd.SetArgs([]string{
cCmd.Cmd.ParseFlags([]string{
fmt.Sprintf("--%s", config.CURVEBS_LOGIC_POOL_ID), strings.Join(logicalpoolids, ","),
fmt.Sprintf("--%s", config.CURVEBS_COPYSET_ID), strings.Join(copysetIds, ","),
})
key2Health, errCmd := copyset2.CheckCopysets(cCmd.Cmd)
key2Health, errCmd := copyset.CheckCopysets(cCmd.Cmd)
if errCmd.TypeCode() != cmderror.CODE_SUCCESS {
return errCmd.ToError()
}

for _, infos := range *addr2Copysets {
for _, info := range infos {
key := cobrautil.GetCopysetKey(uint64(info.GetLogicalPoolId()), uint64(info.GetCopysetId()))
if health, ok := (*key2Health)[key]; !ok || health == cobrautil.HEALTH_ERROR {
copysets = append(copysets, info)
}
for _, info := range addr2Copysets {
key := cobrautil.GetCopysetKey(uint64(info.GetLogicalPoolId()), uint64(info.GetCopysetId()))
if health, ok := (*key2Health)[key]; !ok || health == cobrautil.HEALTH_ERROR {
copysets = append(copysets, info)
}
}
}
Expand Down