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 6C573695D1 for ; Fri, 13 Nov 2020 14:09:05 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 6A5611AEAF for ; Fri, 13 Nov 2020 14:09:05 +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 BA44A1AE9E for ; Fri, 13 Nov 2020 14:09:03 +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 87652424BE for ; Fri, 13 Nov 2020 14:09:03 +0100 (CET) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Fri, 13 Nov 2020 14:08:55 +0100 Message-Id: <20201113130855.18161-3-f.ebner@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201113130855.18161-1-f.ebner@proxmox.com> References: <20201113130855.18161-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.026 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment KAM_SHORT 0.001 Use of a URL Shortener for very short URL 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. [plugin.pm, gnu.org, storage.pm] Subject: [pve-devel] [PATCH storage 3/3] prune: allow having all prune options zero/missing 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: Fri, 13 Nov 2020 13:09:05 -0000 This is basically necessary for the GUI's prune widget, because we want to pass along all options equal to zero when all the number fields are cleared. And it's more similar to how it's done in PBS now. Bumped the APIAGE and APIVER, in case some external plugin needs to adapt to the now less restrictive schema for 'prune-backups'. Signed-off-by: Fabian Ebner --- One could work around the issue in the GUI by not calling the prune API in case all number fields are empty, and change the 'keep' value to 'true' for each backup in the store. But that is rather hacky and being more in line with PBS seems to be a good thing in any case. PVE/Storage.pm | 4 ++-- PVE/Storage/Plugin.pm | 10 +--------- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/PVE/Storage.pm b/PVE/Storage.pm index a2f400c..bd6e15e 100755 --- a/PVE/Storage.pm +++ b/PVE/Storage.pm @@ -41,11 +41,11 @@ use PVE::Storage::DRBDPlugin; use PVE::Storage::PBSPlugin; # Storage API version. Increment it on changes in storage API interface. -use constant APIVER => 7; +use constant APIVER => 8; # Age is the number of versions we're backward compatible with. # This is like having 'current=APIVER' and age='APIAGE' in libtool, # see https://www.gnu.org/software/libtool/manual/html_node/Libtool-versioning.html -use constant APIAGE => 6; +use constant APIAGE => 7; # load standard plugins PVE::Storage::DirPlugin->register(); diff --git a/PVE/Storage/Plugin.pm b/PVE/Storage/Plugin.pm index b4f3be8..fe56864 100644 --- a/PVE/Storage/Plugin.pm +++ b/PVE/Storage/Plugin.pm @@ -82,15 +82,7 @@ our $prune_backups_format = { 'than one backup for a single year, only the latest one is kept.' }, }; -PVE::JSONSchema::register_format('prune-backups', $prune_backups_format, \&validate_prune_backups); -sub validate_prune_backups { - my ($keep) = @_; - - die "at least one keep-option must be set and positive\n" - if !grep { $_ } values %{$keep}; - - return $keep; -} +PVE::JSONSchema::register_format('prune-backups', $prune_backups_format); register_standard_option('prune-backups', { description => "The retention options with shorter intervals are processed first " . "with --keep-last being the very first one. Each option covers a " . -- 2.20.1