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 88730751CA for ; Fri, 4 Jun 2021 15:50:25 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 7F64A1DDBA for ; Fri, 4 Jun 2021 15:49:55 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (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 6E7D71DD73 for ; Fri, 4 Jun 2021 15:49:50 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 455384672F for ; Fri, 4 Jun 2021 15:49:50 +0200 (CEST) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Fri, 4 Jun 2021 15:49:26 +0200 Message-Id: <20210604134946.152720-3-f.ebner@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210604134946.152720-1-f.ebner@proxmox.com> References: <20210604134946.152720-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.272 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment KAM_NUMSUBJECT 0.5 Subject ends in numbers excluding current years 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. [common.pm] Subject: [pve-devel] [PATCH/RFC guest-common 2/2] vzdump: defaults: keep all backups by default for 7.0 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, 04 Jun 2021 13:50:25 -0000 and switch to using prune-backups instead of maxfiles. Storages created via the web UI defaulted to keeping all backups already, switch to this safer default here as well. Signed-off-by: Fabian Ebner --- Breaks build in pve-manager, because the tests there need to be adapted, see patch #3 for manager. src/PVE/VZDump/Common.pm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/PVE/VZDump/Common.pm b/src/PVE/VZDump/Common.pm index f325850..83d7413 100644 --- a/src/PVE/VZDump/Common.pm +++ b/src/PVE/VZDump/Common.pm @@ -210,21 +210,22 @@ my $confdesc = { minimum => 0, default => 10, # 10 minutes }, + # FIXME remove with PVE 8.0 or PVE 9.0 maxfiles => { type => 'integer', - description => "Maximal number of backup files per guest system.", + description => "Deprecated: use 'prune-backups' instead. " . + "Maximal number of backup files per guest system.", optional => 1, minimum => 1, - default => 1, }, 'prune-backups' => get_standard_option('prune-backups', { description => "Use these retention options instead of those from the storage configuration.", optional => 1, + default => "keep-all=1", }), remove => { type => 'boolean', - description => "Remove old backup files if there are more than " . - "'maxfiles' backup files or prune according to 'prune-backups'.", + description => "Prune older backups according to 'prune-backups'.", optional => 1, default => 1, }, -- 2.30.2