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 B762362A02 for ; Mon, 21 Dec 2020 14:48:35 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 1EA6F205D9 for ; Mon, 21 Dec 2020 14:48:35 +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 8ADF6204BC 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 5A474453B4 for ; Mon, 21 Dec 2020 14:48:25 +0100 (CET) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Mon, 21 Dec 2020 14:48:20 +0100 Message-Id: <20201221134820.24038-6-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/RFC manager 5/5] vzdump: make parse error for storage critical 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:48:35 -0000 The actual error is already printed on the CLI and in the task log, so there's no real need to make the error message in storage_info() more than "parse error\n". It also can/will end up in the mail subject, which is another reason to keep it simple. Signed-off-by: Fabian Ebner --- Needs a dependency bump for the previous patch PVE/VZDump.pm | 1 + test/vzdump_new_retention_test.pl | 8 +------- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/PVE/VZDump.pm b/PVE/VZDump.pm index d6f9709b..9f486295 100644 --- a/PVE/VZDump.pm +++ b/PVE/VZDump.pm @@ -96,6 +96,7 @@ sub storage_info { my $storage = shift; my $cfg = PVE::Storage::config(); + die "parse error\n" if grep { $_->{section} eq $storage } @{$cfg->{errors}}; my $scfg = PVE::Storage::storage_config($cfg, $storage); my $type = $scfg->{type}; diff --git a/test/vzdump_new_retention_test.pl b/test/vzdump_new_retention_test.pl index 569419fb..6a2b9170 100755 --- a/test/vzdump_new_retention_test.pl +++ b/test/vzdump_new_retention_test.pl @@ -340,7 +340,6 @@ my @tests = ( remove => 1, }, }, - # TODO make parse error critical? { description => 'mixed 2', vzdump_param => { @@ -349,12 +348,7 @@ my @tests = ( storage_param => { 'prune-backups' => 'keephourly=24', }, - expected => { - 'prune-backups' => { - 'keep-last' => 7, - }, - remove => 1, - }, + expected => "could not get storage information for 'local': parse error\n", }, { description => 'mixed 3', -- 2.20.1