From: Fabian Ebner <f.ebner@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: Re: [pve-devel] [PATCH manager] restore default value of 0 for remove/maxfiles
Date: Fri, 6 Nov 2020 09:44:21 +0100 [thread overview]
Message-ID: <de93f855-b32a-135b-0b78-55ce08707a94@proxmox.com> (raw)
In-Reply-To: <20201105152151.16344-1-s.reiter@proxmox.com>
AFAICT the previous behavior is maxfiles = 1 when it's not set anywhere.
That's the default value in the VZDump schema.
And that should happen a bit below in the code:
if (!defined($opts->{'prune-backups'})) {
my $maxfiles = delete $opts->{maxfiles} // $defaults->{maxfiles};
$opts->{'prune-backups'} = { 'keep-last' => $maxfiles } if
$maxfiles;
Or is there some weird perl behavior that makes this not work?
Am 05.11.20 um 16:21 schrieb Stefan Reiter:
> If neither the 'remove' option of vzdump nor the 'maxfiles' option in
> the storage config are set, assume a value of 0, i.e. do not delete
> anything and allow unlimited backups.
>
> Restores previous behaviour that was broken in 7ab7d6f15f.
>
> Also fixes a warning about using '== 0' on a non-number type.
>
> Signed-off-by: Stefan Reiter <s.reiter@proxmox.com>
> ---
> PVE/VZDump.pm | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/PVE/VZDump.pm b/PVE/VZDump.pm
> index 6873ceaf..517becb1 100644
> --- a/PVE/VZDump.pm
> +++ b/PVE/VZDump.pm
> @@ -474,7 +474,7 @@ sub new {
>
> if (!defined($opts->{'prune-backups'}) && !defined($opts->{maxfiles})) {
> $opts->{'prune-backups'} = $info->{'prune-backups'};
> - $opts->{maxfiles} = $info->{maxfiles};
> + $opts->{maxfiles} = $info->{maxfiles} // 0;
> if ($opts->{maxfiles} == 0) {
Wouldn't adding a definedness check here be sufficient?
> # zero means keep all, so avoid triggering any remove code path to be safe
> $opts->{remove} = 0;
>
next prev parent reply other threads:[~2020-11-06 8:44 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-05 15:21 Stefan Reiter
2020-11-06 8:44 ` Fabian Ebner [this message]
2020-11-06 8:46 ` [pve-devel] applied: " 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=de93f855-b32a-135b-0b78-55ce08707a94@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