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 C126D7276B for ; Fri, 2 Jul 2021 11:03:21 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id B2A0D2E3B7 for ; Fri, 2 Jul 2021 11:03:21 +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) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 1DAA82E3AB for ; Fri, 2 Jul 2021 11:03:20 +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 D7F0D4042C for ; Fri, 2 Jul 2021 11:03:13 +0200 (CEST) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Fri, 2 Jul 2021 11:03:09 +0200 Message-Id: <20210702090309.29300-1-f.ebner@proxmox.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.597 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment 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. [proxmox.com, vzdump.pm] Subject: [pve-devel] [PATCH v2 manager] 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: Fri, 02 Jul 2021 09:03:21 -0000 The actual error is already printed while parsing the configuration, so there's no real need to make the error message here more than "parse error". It also can end up in the mail subject, which is another reason to keep it simple. Signed-off-by: Fabian Ebner --- Was not applied last time, because of the missing dependency bump on libpve-common-perl: https://lists.proxmox.com/pipermail/pve-devel/2020-December/046561.html Now the dependency is recent enough, and technically it's a breaking change, so 7.0 is actually the proper time for it. Changes from v1: * dropped already applied patches * rebased on current master (test file was renamed) PVE/VZDump.pm | 1 + test/vzdump_new_test.pl | 8 +------- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/PVE/VZDump.pm b/PVE/VZDump.pm index 46cb9e6d..b5ba7b20 100644 --- a/PVE/VZDump.pm +++ b/PVE/VZDump.pm @@ -97,6 +97,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_test.pl b/test/vzdump_new_test.pl index 23676239..6b70a53c 100755 --- a/test/vzdump_new_test.pl +++ b/test/vzdump_new_test.pl @@ -346,7 +346,6 @@ my @tests = ( remove => 1, }, }, - # TODO make parse error critical? { description => 'mixed 2', vzdump_param => { @@ -355,12 +354,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.30.2