From 1668c1042b5cbb7806b8f7068058f094f91ec3f3 Mon Sep 17 00:00:00 2001 From: Lisandro Pin Date: Sun, 2 Nov 2025 17:54:37 +0100 Subject: [PATCH] Rework collection resultion for `ec.rebuild`, in preparation for parallelization. (#7420) * Rework collection resultion for `ec.rebuild`, in preparation for parallelization. See https://github.com/seaweedfs/seaweedfs/issues/7416 . * simplify * Update weed/shell/command_ec_rebuild.go Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com> --------- Co-authored-by: chrislu Co-authored-by: Chris Lu Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com> --- weed/shell/command_ec_rebuild.go | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/weed/shell/command_ec_rebuild.go b/weed/shell/command_ec_rebuild.go index cceaa1899..f0b6b5261 100644 --- a/weed/shell/command_ec_rebuild.go +++ b/weed/shell/command_ec_rebuild.go @@ -79,20 +79,20 @@ func (c *commandEcRebuild) Do(args []string, commandEnv *CommandEnv, writer io.W return err } + var collections []string if *collection == "EACH_COLLECTION" { - collections, err := ListCollectionNames(commandEnv, false, true) + collections, err = ListCollectionNames(commandEnv, false, true) if err != nil { return err } - fmt.Printf("rebuildEcVolumes collections %+v\n", len(collections)) - for _, c := range collections { - fmt.Printf("rebuildEcVolumes collection %+v\n", c) - if err = rebuildEcVolumes(commandEnv, allEcNodes, c, writer, *applyChanges); err != nil { - return err - } - } } else { - if err = rebuildEcVolumes(commandEnv, allEcNodes, *collection, writer, *applyChanges); err != nil { + collections = []string{*collection} + } + + fmt.Printf("rebuildEcVolumes for %d collection(s)\n", len(collections)) + for _, c := range collections { + fmt.Printf("rebuildEcVolumes collection %s\n", c) + if err = rebuildEcVolumes(commandEnv, allEcNodes, c, writer, *applyChanges); err != nil { return err } }