Browse Source

Execution Order Corrected

pull/7450/head
chrislu 4 weeks ago
parent
commit
35e460d88f
  1. 4
      weed/shell/command_collection_delete.go
  2. 4
      weed/shell/command_ec_balance.go
  3. 4
      weed/shell/command_ec_rebuild.go
  4. 4
      weed/shell/command_volume_check_disk.go
  5. 3
      weed/shell/command_volume_delete_empty.go
  6. 2
      weed/shell/command_volume_fix_replication.go
  7. 4
      weed/shell/command_volume_server_evacuate.go
  8. 4
      weed/shell/command_volume_tier_move.go

4
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")
}

4
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)

4
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 {

4
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

3
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)

2
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 {

4
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=<host>:<port> or source rack")
}

4
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)

Loading…
Cancel
Save