forked from TrueCloudLab/frostfs-node
[#1867] neofs-cli: Support multiple shard IDs in control subcommands
Signed-off-by: Evgenii Stratonikov <evgeniy@morphbits.ru>
This commit is contained in:
parent
19c0a74e94
commit
b632260995
4 changed files with 36 additions and 6 deletions
|
@ -25,6 +25,7 @@ Changelog for NeoFS Node
|
||||||
- Make `morph.cache_ttl` default value equal to morph block time (#1846)
|
- Make `morph.cache_ttl` default value equal to morph block time (#1846)
|
||||||
- Policer marks nodes under maintenance as OK without requests (#1680)
|
- Policer marks nodes under maintenance as OK without requests (#1680)
|
||||||
- Unify help messages in CLI (#1854)
|
- Unify help messages in CLI (#1854)
|
||||||
|
- `evacuate`, `set-mode` and `flush-cache` control subcommands now accept a list of shard ids (#1867)
|
||||||
|
|
||||||
### Fixed
|
### Fixed
|
||||||
- Description of command `netmap nodeinfo` (#1821)
|
- Description of command `netmap nodeinfo` (#1821)
|
||||||
|
|
|
@ -20,7 +20,7 @@ func evacuateShard(cmd *cobra.Command, _ []string) {
|
||||||
pk := key.Get(cmd)
|
pk := key.Get(cmd)
|
||||||
|
|
||||||
req := &control.EvacuateShardRequest{Body: new(control.EvacuateShardRequest_Body)}
|
req := &control.EvacuateShardRequest{Body: new(control.EvacuateShardRequest_Body)}
|
||||||
req.Body.Shard_ID = [][]byte{getShardID(cmd)}
|
req.Body.Shard_ID = getShardIDList(cmd)
|
||||||
req.Body.IgnoreErrors, _ = cmd.Flags().GetBool(dumpIgnoreErrorsFlag)
|
req.Body.IgnoreErrors, _ = cmd.Flags().GetBool(dumpIgnoreErrorsFlag)
|
||||||
|
|
||||||
signRequest(cmd, pk, req)
|
signRequest(cmd, pk, req)
|
||||||
|
@ -47,7 +47,7 @@ func initControlEvacuateShardCmd() {
|
||||||
|
|
||||||
flags := evacuateShardCmd.Flags()
|
flags := evacuateShardCmd.Flags()
|
||||||
flags.String(controlRPC, controlRPCDefault, controlRPCUsage)
|
flags.String(controlRPC, controlRPCDefault, controlRPCUsage)
|
||||||
flags.String(shardIDFlag, "", "Shard ID in base58 encoding")
|
flags.StringSlice(shardIDFlag, nil, "List of shard IDs in base58 encoding")
|
||||||
flags.Bool(dumpIgnoreErrorsFlag, false, "Skip invalid/unreadable objects")
|
flags.Bool(dumpIgnoreErrorsFlag, false, "Skip invalid/unreadable objects")
|
||||||
|
|
||||||
_ = evacuateShardCmd.MarkFlagRequired(shardIDFlag)
|
_ = evacuateShardCmd.MarkFlagRequired(shardIDFlag)
|
||||||
|
|
|
@ -20,7 +20,7 @@ func flushCache(cmd *cobra.Command, _ []string) {
|
||||||
pk := key.Get(cmd)
|
pk := key.Get(cmd)
|
||||||
|
|
||||||
req := &control.FlushCacheRequest{Body: new(control.FlushCacheRequest_Body)}
|
req := &control.FlushCacheRequest{Body: new(control.FlushCacheRequest_Body)}
|
||||||
req.Body.Shard_ID = [][]byte{getShardID(cmd)}
|
req.Body.Shard_ID = getShardIDList(cmd)
|
||||||
|
|
||||||
signRequest(cmd, pk, req)
|
signRequest(cmd, pk, req)
|
||||||
|
|
||||||
|
@ -44,7 +44,7 @@ func initControlFlushCacheCmd() {
|
||||||
|
|
||||||
ff := flushCacheCmd.Flags()
|
ff := flushCacheCmd.Flags()
|
||||||
ff.String(controlRPC, controlRPCDefault, controlRPCUsage)
|
ff.String(controlRPC, controlRPCDefault, controlRPCUsage)
|
||||||
ff.String(shardIDFlag, "", "Shard ID in base58 encoding")
|
ff.StringSlice(shardIDFlag, nil, "List of shard IDs in base58 encoding")
|
||||||
|
|
||||||
_ = flushCacheCmd.MarkFlagRequired(shardIDFlag)
|
_ = flushCacheCmd.MarkFlagRequired(shardIDFlag)
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
package control
|
package control
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
|
||||||
"github.com/mr-tron/base58"
|
"github.com/mr-tron/base58"
|
||||||
|
@ -36,7 +37,7 @@ func initControlSetShardModeCmd() {
|
||||||
flags := setShardModeCmd.Flags()
|
flags := setShardModeCmd.Flags()
|
||||||
|
|
||||||
flags.String(controlRPC, controlRPCDefault, controlRPCUsage)
|
flags.String(controlRPC, controlRPCDefault, controlRPCUsage)
|
||||||
flags.String(shardIDFlag, "", "ID of the shard in base58 encoding")
|
flags.StringSlice(shardIDFlag, nil, "List of shard IDs in base58 encoding")
|
||||||
flags.String(shardModeFlag, "",
|
flags.String(shardModeFlag, "",
|
||||||
fmt.Sprintf("New shard mode keyword ('%s', '%s', '%s')",
|
fmt.Sprintf("New shard mode keyword ('%s', '%s', '%s')",
|
||||||
shardModeReadWrite,
|
shardModeReadWrite,
|
||||||
|
@ -71,7 +72,7 @@ func setShardMode(cmd *cobra.Command, _ []string) {
|
||||||
req.SetBody(body)
|
req.SetBody(body)
|
||||||
|
|
||||||
body.SetMode(mode)
|
body.SetMode(mode)
|
||||||
body.SetShardIDList([][]byte{getShardID(cmd)})
|
body.SetShardIDList(getShardIDList(cmd))
|
||||||
|
|
||||||
reset, _ := cmd.Flags().GetBool(shardClearErrorsFlag)
|
reset, _ := cmd.Flags().GetBool(shardClearErrorsFlag)
|
||||||
body.ClearErrorCounter(reset)
|
body.ClearErrorCounter(reset)
|
||||||
|
@ -99,3 +100,31 @@ func getShardID(cmd *cobra.Command) []byte {
|
||||||
common.ExitOnErr(cmd, "incorrect shard ID encoding: %w", err)
|
common.ExitOnErr(cmd, "incorrect shard ID encoding: %w", err)
|
||||||
return raw
|
return raw
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func getShardIDList(cmd *cobra.Command) [][]byte {
|
||||||
|
sidList, _ := cmd.Flags().GetStringSlice(shardIDFlag)
|
||||||
|
if len(sidList) == 0 {
|
||||||
|
common.ExitOnErr(cmd, "", errors.New("no shard IDs were provided"))
|
||||||
|
}
|
||||||
|
|
||||||
|
// We can sort the ID list and perform this check without additional allocations,
|
||||||
|
// but preserving the user order is a nice thing to have.
|
||||||
|
// Also, this is a CLI, we don't care too much about this.
|
||||||
|
seen := make(map[string]struct{})
|
||||||
|
for i := range sidList {
|
||||||
|
if _, ok := seen[sidList[i]]; ok {
|
||||||
|
common.ExitOnErr(cmd, "", fmt.Errorf("duplicated shard IDs: %s", sidList[i]))
|
||||||
|
}
|
||||||
|
seen[sidList[i]] = struct{}{}
|
||||||
|
}
|
||||||
|
|
||||||
|
res := make([][]byte, 0, len(sidList))
|
||||||
|
for i := range sidList {
|
||||||
|
raw, err := base58.Decode(sidList[i])
|
||||||
|
common.ExitOnErr(cmd, "incorrect shard ID encoding: %w", err)
|
||||||
|
|
||||||
|
res = append(res, raw)
|
||||||
|
}
|
||||||
|
|
||||||
|
return res
|
||||||
|
}
|
||||||
|
|
Loading…
Reference in a new issue