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 1D6D362437 for ; Mon, 23 Nov 2020 13:34:07 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 0D0F128A4C 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 2A59328A34 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 E3FE543F79 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:10 +0100 Message-Id: <20201123123310.13898-3-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. [vzdump.pm] Subject: [pve-devel] [PATCH manager 3/3] vzdump: adapt to new keep-all prune option 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:34:07 -0000 Signed-off-by: Fabian Ebner --- PVE/VZDump.pm | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/PVE/VZDump.pm b/PVE/VZDump.pm index 59062d2b..178f37f5 100644 --- a/PVE/VZDump.pm +++ b/PVE/VZDump.pm @@ -494,11 +494,13 @@ sub new { if ($maxfiles) { $opts->{'prune-backups'} = { 'keep-last' => $maxfiles }; } else { - # maxfiles being zero means keep all, so avoid triggering any remove code path to be safe - $opts->{remove} = 0; + $opts->{'prune-backups'} = { 'keep-all' => 1 }; } } + # avoid triggering any remove code path if keep-all is set + $opts->{remove} = 0 if $opts->{'prune-backups'}->{'keep-all'}; + if ($opts->{tmpdir} && ! -d $opts->{tmpdir}) { $errors .= "\n" if $errors; $errors .= "tmpdir '$opts->{tmpdir}' does not exist"; @@ -735,8 +737,13 @@ sub exec_backup_task { my $prune_options = $opts->{'prune-backups'}; my $backup_limit = 0; - foreach my $keep (values %{$prune_options}) { - $backup_limit += $keep; + my $keep_all = delete $prune_options->{'keep-all'}; + if ($keep_all) { + $prune_options = { 'keep-all' => 1 }; + } else { + foreach my $keep (values %{$prune_options}) { + $backup_limit += $keep; + } } if ($backup_limit && !$opts->{remove}) { -- 2.20.1