From 35e460d88f4ccaaf77772035bbd4944d9dc546a6 Mon Sep 17 00:00:00 2001 From: chrislu Date: Sun, 9 Nov 2025 18:43:00 -0800 Subject: [PATCH] Execution Order Corrected --- weed/shell/command_collection_delete.go | 4 ++-- weed/shell/command_ec_balance.go | 4 ++-- weed/shell/command_ec_rebuild.go | 4 ++-- weed/shell/command_volume_check_disk.go | 4 ++-- weed/shell/command_volume_delete_empty.go | 3 ++- weed/shell/command_volume_fix_replication.go | 2 +- weed/shell/command_volume_server_evacuate.go | 4 ++-- weed/shell/command_volume_tier_move.go | 4 ++-- 8 files changed, 15 insertions(+), 14 deletions(-) diff --git a/weed/shell/command_collection_delete.go b/weed/shell/command_collection_delete.go index 04f07035d..ba635a090 100644 --- a/weed/shell/command_collection_delete.go +++ b/weed/shell/command_collection_delete.go @@ -43,14 +43,14 @@ func (c *commandCollectionDelete) Do(args []string, commandEnv *CommandEnv, writ if err = colDeleteCommand.Parse(args); err != nil { return nil } + + handleDeprecatedForceFlag(writer, applyBalancingAlias, applyBalancing) infoAboutSimulationMode(writer, *applyBalancing, "-apply") if err = commandEnv.confirmIsLocked(args); err != nil { return } - handleDeprecatedForceFlag(writer, applyBalancingAlias, applyBalancing) - if *collectionName == "" { return fmt.Errorf("empty collection name is not allowed") } diff --git a/weed/shell/command_ec_balance.go b/weed/shell/command_ec_balance.go index 1ab0713dc..ea97739e1 100644 --- a/weed/shell/command_ec_balance.go +++ b/weed/shell/command_ec_balance.go @@ -43,14 +43,14 @@ func (c *commandEcBalance) Do(args []string, commandEnv *CommandEnv, writer io.W if err = balanceCommand.Parse(args); err != nil { return nil } + + handleDeprecatedForceFlag(writer, applyBalancingAlias, applyBalancing) infoAboutSimulationMode(writer, *applyBalancing, "-apply") if err = commandEnv.confirmIsLocked(args); err != nil { return } - handleDeprecatedForceFlag(writer, applyBalancingAlias, applyBalancing) - var collections []string if *collection == "EACH_COLLECTION" { collections, err = ListCollectionNames(commandEnv, false, true) diff --git a/weed/shell/command_ec_rebuild.go b/weed/shell/command_ec_rebuild.go index fa7e5a4ee..ef12b080a 100644 --- a/weed/shell/command_ec_rebuild.go +++ b/weed/shell/command_ec_rebuild.go @@ -69,14 +69,14 @@ func (c *commandEcRebuild) Do(args []string, commandEnv *CommandEnv, writer io.W if err = fixCommand.Parse(args); err != nil { return nil } + + handleDeprecatedForceFlag(writer, applyChangesAlias, applyChanges) infoAboutSimulationMode(writer, *applyChanges, "-apply") if err = commandEnv.confirmIsLocked(args); err != nil { return } - handleDeprecatedForceFlag(writer, applyChangesAlias, applyChanges) - // collect all ec nodes allEcNodes, _, err := collectEcNodes(commandEnv) if err != nil { diff --git a/weed/shell/command_volume_check_disk.go b/weed/shell/command_volume_check_disk.go index ce7c2348d..eb92ec6c0 100644 --- a/weed/shell/command_volume_check_disk.go +++ b/weed/shell/command_volume_check_disk.go @@ -128,13 +128,13 @@ func (c *commandVolumeCheckDisk) Do(args []string, commandEnv *CommandEnv, write if err = fsckCommand.Parse(args); err != nil { return nil } + + handleDeprecatedForceFlag(writer, applyChangesAlias, applyChanges) infoAboutSimulationMode(writer, *applyChanges, "-apply") if err = commandEnv.confirmIsLocked(args); err != nil { return } - - handleDeprecatedForceFlag(writer, applyChangesAlias, applyChanges) c.env = commandEnv c.writer = writer diff --git a/weed/shell/command_volume_delete_empty.go b/weed/shell/command_volume_delete_empty.go index 579a0e76b..154f8942c 100644 --- a/weed/shell/command_volume_delete_empty.go +++ b/weed/shell/command_volume_delete_empty.go @@ -47,12 +47,13 @@ func (c *commandVolumeDeleteEmpty) Do(args []string, commandEnv *CommandEnv, wri if err = volDeleteCommand.Parse(args); err != nil { return nil } + + handleDeprecatedForceFlag(writer, applyBalancingAlias, applyBalancing) infoAboutSimulationMode(writer, *applyBalancing, "-apply") if err = commandEnv.confirmIsLocked(args); err != nil { return } - handleDeprecatedForceFlag(writer, applyBalancingAlias, applyBalancing) // collect topology information topologyInfo, _, err := collectTopologyInfo(commandEnv, 0) diff --git a/weed/shell/command_volume_fix_replication.go b/weed/shell/command_volume_fix_replication.go index 2588b0a21..0cae31c55 100644 --- a/weed/shell/command_volume_fix_replication.go +++ b/weed/shell/command_volume_fix_replication.go @@ -78,9 +78,9 @@ func (c *commandVolumeFixReplication) Do(args []string, commandEnv *CommandEnv, if err = volFixReplicationCommand.Parse(args); err != nil { return nil } - infoAboutSimulationMode(writer, *applyChanges, "-apply") handleDeprecatedForceFlag(writer, applyChangesAlias, applyChanges) + infoAboutSimulationMode(writer, *applyChanges, "-apply") commandEnv.noLock = !*applyChanges if err = commandEnv.confirmIsLocked(args); *applyChanges && err != nil { diff --git a/weed/shell/command_volume_server_evacuate.go b/weed/shell/command_volume_server_evacuate.go index c56823cd4..06e43b2e5 100644 --- a/weed/shell/command_volume_server_evacuate.go +++ b/weed/shell/command_volume_server_evacuate.go @@ -65,13 +65,13 @@ func (c *commandVolumeServerEvacuate) Do(args []string, commandEnv *CommandEnv, if err = vsEvacuateCommand.Parse(args); err != nil { return nil } + + handleDeprecatedForceFlag(writer, applyChangeAlias, applyChange) infoAboutSimulationMode(writer, *applyChange, "-apply") if err = commandEnv.confirmIsLocked(args); err != nil && *applyChange { return } - - handleDeprecatedForceFlag(writer, applyChangeAlias, applyChange) if *volumeServer == "" && *c.volumeRack == "" { return fmt.Errorf("need to specify volume server by -node=: or source rack") } diff --git a/weed/shell/command_volume_tier_move.go b/weed/shell/command_volume_tier_move.go index 63ddb6f91..1cdb98f0a 100644 --- a/weed/shell/command_volume_tier_move.go +++ b/weed/shell/command_volume_tier_move.go @@ -75,13 +75,13 @@ func (c *commandVolumeTierMove) Do(args []string, commandEnv *CommandEnv, writer if err = tierCommand.Parse(args); err != nil { return nil } + + handleDeprecatedForceFlag(writer, applyChangeAlias, applyChange) infoAboutSimulationMode(writer, *applyChange, "-apply") if err = commandEnv.confirmIsLocked(args); err != nil { return } - - handleDeprecatedForceFlag(writer, applyChangeAlias, applyChange) fromDiskType := types.ToDiskType(*source) toDiskType := types.ToDiskType(*target)