s.makhov/frostfs-node
1
0
Fork 0
forked from TrueCloudLab/frostfs-node
Code Pull requests Activity

[#1867] services/control: Interpret empty list of IDs as all shards

Browse source 
In neofs-cli the flag is still required, but `all` can be used to
process all shards.

Signed-off-by: Evgenii Stratonikov <evgeniy@morphbits.ru>
This commit is contained in:
Evgenii Stratonikov 2022-10-10 21:14:12 +03:00 • committed by fyrchik
parent b632260995
commit c0199dee93
7 changed files with 30 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

12
cmd/neofs-cli/modules/control/shards_set_mode.go
View file

@ -1,7 +1,6 @@
package control
import (
"errors"
"fmt"
"github.com/mr-tron/base58"
@ -16,6 +15,7 @@ import (
const (
shardModeFlag = "mode"
shardIDFlag = "id"
shardAllFlag = "all"
shardClearErrorsFlag = "clear-errors"
shardModeReadOnly = "read-only"
@ -38,6 +38,7 @@ func initControlSetShardModeCmd() {
flags.String(controlRPC, controlRPCDefault, controlRPCUsage)
flags.StringSlice(shardIDFlag, nil, "List of shard IDs in base58 encoding")
flags.Bool(shardAllFlag, false, "Process all shards")
flags.String(shardModeFlag, "",
fmt.Sprintf("New shard mode keyword ('%s', '%s', '%s')",
shardModeReadWrite,
@ -46,6 +47,8 @@ func initControlSetShardModeCmd() {
),
)
flags.Bool(shardClearErrorsFlag, false, "Set shard error count to 0")
setShardModeCmd.MarkFlagsMutuallyExclusive(shardIDFlag, shardAllFlag)
}
func setShardMode(cmd *cobra.Command, _ []string) {
@ -102,9 +105,14 @@ func getShardID(cmd *cobra.Command) []byte {
}
func getShardIDList(cmd *cobra.Command) [][]byte {
all, _ := cmd.Flags().GetBool(shardAllFlag)
if all {
return nil
}
sidList, _ := cmd.Flags().GetStringSlice(shardIDFlag)
if len(sidList) == 0 {
common.ExitOnErr(cmd, "", errors.New("no shard IDs were provided"))
common.ExitOnErr(cmd, "", fmt.Errorf("either --%s or --%s flag must be provided", shardIDFlag, shardAllFlag))
}
// We can sort the ID list and perform this check without additional allocations,