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 925E162A0F for ; Mon, 21 Dec 2020 14:49:01 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 894D3204D4 for ; Mon, 21 Dec 2020 14:48:31 +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 2FA312049F for ; Mon, 21 Dec 2020 14:48:25 +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 E9525454A3 for ; Mon, 21 Dec 2020 14:48:24 +0100 (CET) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Mon, 21 Dec 2020 14:48:16 +0100 Message-Id: <20201221134820.24038-2-f.ebner@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201221134820.24038-1-f.ebner@proxmox.com> References: <20201221134820.24038-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.008 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 Subject: [pve-devel] [PATCH manager 1/5] vzdump: defaults: convert to prune-backups early enough 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, 21 Dec 2020 13:49:01 -0000 Fixes the case where reading from /etc/vzdump.conf fails. Also convert the options read from /etc/vzdump.conf before the loop. That avoids showing a wrong warning when 'prune-backups' is configured in /etc/vzdump.conf, and maxfiles isn't. Previously, because 'maxfiles' from the schema defaults was automatically set, the call to parse_prune_backups_maxfiles after the loop threw the warning that both options are defined. Signed-off-by: Fabian Ebner --- PVE/VZDump.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/PVE/VZDump.pm b/PVE/VZDump.pm index 6a4e641b..f75e4b16 100644 --- a/PVE/VZDump.pm +++ b/PVE/VZDump.pm @@ -211,6 +211,7 @@ sub read_vzdump_defaults { defined($default) ? ($_ => $default) : () } keys %$confdesc }; + $parse_prune_backups_maxfiles->($defaults, "defaults in VZDump schema"); my $raw; eval { $raw = PVE::Tools::file_get_contents($fn); }; @@ -225,6 +226,7 @@ sub read_vzdump_defaults { my @mailto = split_list($res->{mailto}); $res->{mailto} = [ @mailto ]; } + $parse_prune_backups_maxfiles->($res, "options in '$fn'"); foreach my $key (keys %$defaults) { $res->{$key} = $defaults->{$key} if !defined($res->{$key}); @@ -235,8 +237,6 @@ sub read_vzdump_defaults { delete $res->{dumpdir}; } - $parse_prune_backups_maxfiles->($res, "options in '$fn'"); - return $res; } -- 2.20.1