aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian <16049740+bddrey@users.noreply.github.com>2022-09-10 11:05:28 -0400
committerGitHub <noreply@github.com>2022-09-10 08:05:28 -0700
commit4e3e2b1b821572f5417df178dd9fcf9f5d51edab (patch)
treef0062b0ad04a09d7cdfec072538d646e5f7bbf9d
parent205ecb5d0311ec4b37ecae7c43617f931191f59a (diff)
downloadseaweedfs-4e3e2b1b821572f5417df178dd9fcf9f5d51edab.tar.xz
seaweedfs-4e3e2b1b821572f5417df178dd9fcf9f5d51edab.zip
Add option in volume.fix.replication to only fix under-replication and not delete volumes (#3640)
-rw-r--r--weed/shell/command_volume_fix_replication.go6
1 files changed, 4 insertions, 2 deletions
diff --git a/weed/shell/command_volume_fix_replication.go b/weed/shell/command_volume_fix_replication.go
index 5cc4ba645..c773f3904 100644
--- a/weed/shell/command_volume_fix_replication.go
+++ b/weed/shell/command_volume_fix_replication.go
@@ -57,6 +57,7 @@ func (c *commandVolumeFixReplication) Do(args []string, commandEnv *CommandEnv,
volFixReplicationCommand := flag.NewFlagSet(c.Name(), flag.ContinueOnError)
c.collectionPattern = volFixReplicationCommand.String("collectionPattern", "", "match with wildcard characters '*' and '?'")
skipChange := volFixReplicationCommand.Bool("n", false, "skip the changes")
+ noDelete := volFixReplicationCommand.Bool("noDelete", false, "Do not delete over-replicated volumes, only fix under-replication")
retryCount := volFixReplicationCommand.Int("retry", 0, "how many times to retry")
volumesPerStep := volFixReplicationCommand.Int("volumesPerStep", 0, "how many volumes to fix in one cycle")
@@ -69,6 +70,7 @@ func (c *commandVolumeFixReplication) Do(args []string, commandEnv *CommandEnv,
}
takeAction := !*skipChange
+ doDeletes := !*noDelete;
underReplicatedVolumeIdsCount := 1
for underReplicatedVolumeIdsCount > 0 {
@@ -108,13 +110,13 @@ func (c *commandVolumeFixReplication) Do(args []string, commandEnv *CommandEnv,
return fmt.Errorf("lock is lost")
}
- if len(overReplicatedVolumeIds) > 0 {
+ if len(overReplicatedVolumeIds) > 0 && doDeletes {
if err := c.deleteOneVolume(commandEnv, writer, takeAction, overReplicatedVolumeIds, volumeReplicas, allLocations, pickOneReplicaToDelete); err != nil {
return err
}
}
- if len(misplacedVolumeIds) > 0 {
+ if len(misplacedVolumeIds) > 0 && doDeletes {
if err := c.deleteOneVolume(commandEnv, writer, takeAction, misplacedVolumeIds, volumeReplicas, allLocations, pickOneMisplacedVolume); err != nil {
return err
}