From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 4489B623D2 for ; Mon, 23 Nov 2020 13:33:37 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 297DC28A4D for ; Mon, 23 Nov 2020 13:33:37 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 3214E28A39 for ; Mon, 23 Nov 2020 13:33:36 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id EE0CF43F1C for ; Mon, 23 Nov 2020 13:33:35 +0100 (CET) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Mon, 23 Nov 2020 13:33:09 +0100 Message-Id: <20201123123310.13898-2-f.ebner@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201123123310.13898-1-f.ebner@proxmox.com> References: <20201123123310.13898-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.010 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [storage.pm] Subject: [pve-devel] [PATCH storage 2/3] convert maxfiles to prune_backups when reading the storage configuration X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 23 Nov 2020 12:33:37 -0000 If there are already prune options configured, simply delete the maxfiles setting. Having set both is invalid from vzdump's perspective anyways, and any backup job on such a storage failed, meaning a user would've noticed. If there are no prune options, translate the maxfiles value to keep-last, except for maxfiles being zero (=unlimited), in which case we use keep-all. If both are not set, don't set anything, so: 1. Storages don't suddenly have retention options set. 2. People relying on vzdump defaults can still use those. Signed-off-by: Fabian Ebner --- PVE/Storage.pm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/PVE/Storage.pm b/PVE/Storage.pm index d613469..18357a8 100755 --- a/PVE/Storage.pm +++ b/PVE/Storage.pm @@ -129,6 +129,26 @@ sub lock_storage_config { } } +# FIXME remove maxfiles for PVE 7.0 +my $convert_maxfiles_to_prune_backups = sub { + my ($scfg) = @_; + + my $maxfiles = delete $scfg->{maxfiles}; + + if (!defined($scfg->{'prune-backups'}) && defined($maxfiles)) { + my $prune_backups; + if ($maxfiles) { + $prune_backups = { 'keep-last' => $maxfiles }; + } else { # maxfiles 0 means no limit + $prune_backups = { 'keep-all' => 1 }; + } + $scfg->{'prune-backups'} = PVE::JSONSchema::print_property_string( + $prune_backups, + 'prune-backups' + ); + } +}; + sub storage_config { my ($cfg, $storeid, $noerr) = @_; @@ -138,6 +158,8 @@ sub storage_config { die "storage '$storeid' does not exist\n" if (!$noerr && !$scfg); + $convert_maxfiles_to_prune_backups->($scfg); + return $scfg; } -- 2.20.1