From: Fabian Ebner <f.ebner@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH storage 2/3] prune mark: keep all if all prune options are zero/missing
Date: Fri, 13 Nov 2020 14:08:54 +0100 [thread overview]
Message-ID: <20201113130855.18161-2-f.ebner@proxmox.com> (raw)
In-Reply-To: <20201113130855.18161-1-f.ebner@proxmox.com>
as an additional safety measure. And add some tests.
Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
---
This also would've prevented the unwanted removals with the maxfiles
handling I had messed up, because there, prune_mark_backup_group was called
with an empty hash.
PVE/Storage.pm | 7 +++++++
test/prune_backups_test.pm | 40 ++++++++++++++++++++++++++++++++++++++
2 files changed, 47 insertions(+)
diff --git a/PVE/Storage.pm b/PVE/Storage.pm
index 932f0f1..a2f400c 100755
--- 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 1e6a3d1..8bf564d 100644
--- 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;
--
2.20.1
next prev parent reply other threads:[~2020-11-13 13:09 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-13 13:08 [pve-devel] [PATCH storage 1/3] don't pass along keep-options equal to zero to PBS Fabian Ebner
2020-11-13 13:08 ` Fabian Ebner [this message]
2020-11-13 13:08 ` [pve-devel] [PATCH storage 3/3] prune: allow having all prune options zero/missing Fabian Ebner
2020-11-16 9:20 ` [pve-devel] applied-series: [PATCH storage 1/3] don't pass along keep-options equal to zero to PBS Thomas Lamprecht
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201113130855.18161-2-f.ebner@proxmox.com \
--to=f.ebner@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox