prune mark: keep all if all prune options are zero/missing

as an additional safety measure. And add some tests.

Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>

diff --git a/PVE/Storage.pm b/PVE/Storage.pm
index 932f0f186e5d9e1e39fadae4708e47056e75c7d9..a2f400cddcd8264fe96fa2927f297271018c055c 100755 (executable)
--- a/PVE/Storage.pm
+++ b/PVE/Storage.pm
@@ -1622,6 +1622,13 @@ my $prune_mark = sub {
 sub prune_mark_backup_group {
     my ($backup_group, $keep) = @_;
 
+    if (!scalar(grep {$_ > 0} values %{$keep})) {
+       foreach my $prune_entry (@{$backup_group}) {
+           $prune_entry->{mark} = 'keep';
+       }
+       return;
+    }
+
     my $prune_list = [ sort { $b->{ctime} <=> $a->{ctime} } @{$backup_group} ];
 
     $prune_mark->($prune_list, $keep->{'keep-last'}, sub {

diff --git a/test/prune_backups_test.pm b/test/prune_backups_test.pm
index 1e6a3d107fa66406a9cb2aa3a200d0a36f862ce2..8bf564df7be76662c06c5fadec90494d1b90c00a 100644 (file)
--- a/test/prune_backups_test.pm
+++ b/test/prune_backups_test.pm
@@ -239,6 +239,18 @@ my $tests = [
        },
        expected => generate_expected(\@vmids, undef, ['keep', 'remove', 'keep', 'remove', 'keep', 'keep']),
     },
+    {
+       description => 'last=daily=weekly=1, others zero, multiple IDs',
+       keep => {
+           'keep-hourly' => 0,
+           'keep-last' => 1,
+           'keep-daily' => 1,
+           'keep-weekly' => 1,
+           'keep-monthly' => 0,
+           'keep-yearly' => 0,
+       },
+       expected => generate_expected(\@vmids, undef, ['keep', 'remove', 'keep', 'remove', 'keep', 'keep']),
+    },
     {
        description => 'daily=2, one ID',
        vmid => $vmids[0],
@@ -321,6 +333,34 @@ my $tests = [
            },
        ],
     },
+    {
+       description => 'all missing, multiple IDs',
+       keep => {},
+       expected => generate_expected(\@vmids, undef, ['keep', 'keep', 'keep', 'keep', 'keep', 'keep']),
+    },
+    {
+       description => 'all zero, multiple IDs',
+       keep => {
+           'keep-last' => 0,
+           'keep-hourly' => 0,
+           'keep-daily' => 0,
+           'keep-weekly' => 0,
+           'keep-monthyl' => 0,
+           'keep-yearly' => 0,
+       },
+       expected => generate_expected(\@vmids, undef, ['keep', 'keep', 'keep', 'keep', 'keep', 'keep']),
+    },
+    {
+       description => 'some zero, some missing, multiple IDs',
+       keep => {
+           'keep-last' => 0,
+           'keep-hourly' => 0,
+           'keep-daily' => 0,
+           'keep-monthyl' => 0,
+           'keep-yearly' => 0,
+       },
+       expected => generate_expected(\@vmids, undef, ['keep', 'keep', 'keep', 'keep', 'keep', 'keep']),
+    },
 ];
 
 plan tests => scalar @$tests;