Proxmox/pve-storage
5
0
Fork 0
mirror of git://git.proxmox.com/git/pve-storage.git synced 2025-01-11 05:18:01 +03:00
Code Releases Activity

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

Browse Source 
as an additional safety measure. And add some tests.

Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
This commit is contained in:
Fabian Ebner 2020-11-13 14:08:54 +01:00 committed by Thomas Lamprecht
parent 14c922b7da
commit f514181d28
2 changed files with 47 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
PVE/Storage.pm
View File

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

40
test/prune_backups_test.pm
View File

@ -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;