From 1b87f01388da882c31cc91d7cc142d3181faa085 Mon Sep 17 00:00:00 2001 From: Fabian Ebner Date: Mon, 23 Nov 2020 13:33:08 +0100 Subject: [PATCH] prune: introduce keep-all option useful to have an alternative to the old maxfiles = 0. There has to be a way for vzdump to distinguish between: 1. use the /etc/vzdump.conf default (when no options are configured for the storage) 2. use no limit (when keep-all=1) Signed-off-by: Fabian Ebner --- PVE/Storage.pm | 5 ++++- PVE/Storage/PBSPlugin.pm | 15 +++++++++++---- PVE/Storage/Plugin.pm | 20 +++++++++++++++++++- 3 files changed, 34 insertions(+), 6 deletions(-) diff --git a/PVE/Storage.pm b/PVE/Storage.pm index 13fea73..7314085 100755 --- a/PVE/Storage.pm +++ b/PVE/Storage.pm @@ -1623,7 +1623,10 @@ my $prune_mark = sub { sub prune_mark_backup_group { my ($backup_group, $keep) = @_; - if (!scalar(grep {$_ > 0} values %{$keep})) { + my $keep_all = delete $keep->{'keep-all'}; + + if ($keep_all || !scalar(grep {$_ > 0} values %{$keep})) { + $keep = { 'keep-all' => 1 } if $keep_all; foreach my $prune_entry (@{$backup_group}) { $prune_entry->{mark} = 'keep'; } diff --git a/PVE/Storage/PBSPlugin.pm b/PVE/Storage/PBSPlugin.pm index 2e6d3f6..ef9bc79 100644 --- a/PVE/Storage/PBSPlugin.pm +++ b/PVE/Storage/PBSPlugin.pm @@ -313,10 +313,17 @@ sub prune_backups { } my @param; - foreach my $opt (keys %{$keep}) { - next if $keep->{$opt} == 0; - push @param, "--$opt"; - push @param, "$keep->{$opt}"; + + my $keep_all = delete $keep->{'keep-all'}; + + if (!$keep_all) { + foreach my $opt (keys %{$keep}) { + next if $keep->{$opt} == 0; + push @param, "--$opt"; + push @param, "$keep->{$opt}"; + } + } else { # no need to pass anything to PBS + $keep = { 'keep-all' => 1 }; } push @param, '--dry-run' if $dryrun; diff --git a/PVE/Storage/Plugin.pm b/PVE/Storage/Plugin.pm index 94d42eb..c60d84b 100644 --- a/PVE/Storage/Plugin.pm +++ b/PVE/Storage/Plugin.pm @@ -52,6 +52,11 @@ my %prune_option = ( ); our $prune_backups_format = { + 'keep-all' => { + type => 'boolean', + description => 'Keep all backups. Conflicts with the other options when true.', + optional => 1, + }, 'keep-last' => { %prune_option, description => 'Keep the last backups.', @@ -82,7 +87,20 @@ our $prune_backups_format = { 'than one backup for a single year, only the latest one is kept.' }, }; -PVE::JSONSchema::register_format('prune-backups', $prune_backups_format); +PVE::JSONSchema::register_format('prune-backups', $prune_backups_format, \&validate_prune_backups); +sub validate_prune_backups { + my ($prune_backups) = @_; + + my $keep_all = delete $prune_backups->{'keep-all'}; + + if (!scalar(grep {$_ > 0} values %{$prune_backups})) { + $prune_backups = { 'keep-all' => 1 }; + } elsif ($keep_all) { + die "keep-all cannot be set together with other options.\n"; + } + + return $prune_backups; +} register_standard_option('prune-backups', { description => "The retention options with shorter intervals are processed first " . "with --keep-last being the very first one. Each option covers a " .