From 0be020b0fab7419bb55fc5159dd699be56e2a605 Mon Sep 17 00:00:00 2001 From: Lisandro Pin Date: Tue, 13 May 2025 16:59:26 +0200 Subject: [PATCH] Nit: unify the default `--maxParallelization` value for `weed shell` commands supporting this option (#6788) --- weed/shell/command_ec_balance.go | 2 +- weed/shell/command_ec_encode.go | 2 +- weed/shell/common.go | 5 +++++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/weed/shell/command_ec_balance.go b/weed/shell/command_ec_balance.go index 08bbd2a22..96c59f9da 100644 --- a/weed/shell/command_ec_balance.go +++ b/weed/shell/command_ec_balance.go @@ -35,7 +35,7 @@ func (c *commandEcBalance) Do(args []string, commandEnv *CommandEnv, writer io.W collection := balanceCommand.String("collection", "EACH_COLLECTION", "collection name, or \"EACH_COLLECTION\" for each collection") dc := balanceCommand.String("dataCenter", "", "only apply the balancing for this dataCenter") shardReplicaPlacement := balanceCommand.String("shardReplicaPlacement", "", "replica placement for EC shards, or master default if empty") - maxParallelization := balanceCommand.Int("maxParallelization", 10, "run up to X tasks in parallel, whenever possible") + maxParallelization := balanceCommand.Int("maxParallelization", DefaultMaxParallelization, "run up to X tasks in parallel, whenever possible") applyBalancing := balanceCommand.Bool("force", false, "apply the balancing plan") if err = balanceCommand.Parse(args); err != nil { return nil diff --git a/weed/shell/command_ec_encode.go b/weed/shell/command_ec_encode.go index d9e3a88c6..db2fac469 100644 --- a/weed/shell/command_ec_encode.go +++ b/weed/shell/command_ec_encode.go @@ -66,7 +66,7 @@ func (c *commandEcEncode) Do(args []string, commandEnv *CommandEnv, writer io.Wr collection := encodeCommand.String("collection", "", "the collection name") fullPercentage := encodeCommand.Float64("fullPercent", 95, "the volume reaches the percentage of max volume size") quietPeriod := encodeCommand.Duration("quietFor", time.Hour, "select volumes without no writes for this period") - maxParallelization := encodeCommand.Int("maxParallelization", 10, "run up to X tasks in parallel, whenever possible") + maxParallelization := encodeCommand.Int("maxParallelization", DefaultMaxParallelization, "run up to X tasks in parallel, whenever possible") forceChanges := encodeCommand.Bool("force", false, "force the encoding even if the cluster has less than recommended 4 nodes") shardReplicaPlacement := encodeCommand.String("shardReplicaPlacement", "", "replica placement for EC shards, or master default if empty") applyBalancing := encodeCommand.Bool("rebalance", false, "re-balance EC shards after creation") diff --git a/weed/shell/common.go b/weed/shell/common.go index 9fe190b31..43571176e 100644 --- a/weed/shell/common.go +++ b/weed/shell/common.go @@ -5,6 +5,11 @@ import ( "sync" ) +var ( + // Default maximum parallelization/concurrency for commands supporting it. + DefaultMaxParallelization = 10 +) + // ErrorWaitGroup implements a goroutine wait group which aggregates errors, if any. type ErrorWaitGroup struct { maxConcurrency int