From: Fabian Ebner <f.ebner@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH manager 2/4] vzdump: storage_info: adapt to new maxfiles backend behavior
Date: Tue, 1 Dec 2020 09:24:19 +0100 [thread overview]
Message-ID: <20201201082421.4646-2-f.ebner@proxmox.com> (raw)
In-Reply-To: <20201201082421.4646-1-f.ebner@proxmox.com>
It's automatically converted to prune-backups when using storage_config() now.
Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
---
PVE/VZDump.pm | 4 ----
1 file changed, 4 deletions(-)
diff --git a/PVE/VZDump.pm b/PVE/VZDump.pm
index c37fa513..94aa76ab 100644
--- a/PVE/VZDump.pm
+++ b/PVE/VZDump.pm
@@ -86,15 +86,11 @@ sub storage_info {
my $info = {
scfg => $scfg,
- maxfiles => $scfg->{maxfiles},
};
$info->{'prune-backups'} = PVE::JSONSchema::parse_property_string('prune-backups', $scfg->{'prune-backups'})
if defined($scfg->{'prune-backups'});
- die "cannot have 'maxfiles' and 'prune-backups' configured at the same time\n"
- if defined($info->{'prune-backups'}) && defined($info->{maxfiles});
-
if ($type eq 'pbs') {
$info->{pbs} = 1;
} else {
--
2.20.1
next prev parent reply other threads:[~2020-12-01 8:24 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-01 8:24 [pve-devel] [PATCH manager 1/4] test: add tests for retention parameters for vzdump's new() Fabian Ebner
2020-12-01 8:24 ` Fabian Ebner [this message]
2020-12-01 8:24 ` [pve-devel] [PATCH manager 3/4] vzdump: convert maxfiles CLI parameter to prune-backups Fabian Ebner
2020-12-01 8:24 ` [pve-devel] [PATCH manager 4/4] vzdump: defaults: correctly parse prune-backups and convert maxfiles Fabian Ebner
2020-12-02 17:02 ` [pve-devel] applied-series: [PATCH manager 1/4] test: add tests for retention parameters for vzdump's new() 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=20201201082421.4646-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