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 459C462AF7 for ; Mon, 21 Dec 2020 15:56:54 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 3D0CA223E1 for ; Mon, 21 Dec 2020 15:56:24 +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 AEAF0223D4 for ; Mon, 21 Dec 2020 15:56:23 +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 75CF044CD2 for ; Mon, 21 Dec 2020 15:56:23 +0100 (CET) Message-ID: <959fcdc7-bdc7-9511-ea7d-6cd2f88e6149@proxmox.com> Date: Mon, 21 Dec 2020 15:56:21 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:85.0) Gecko/20100101 Thunderbird/85.0 Content-Language: en-GB To: Proxmox VE development discussion , Fabian Ebner References: <20201221134820.24038-1-f.ebner@proxmox.com> <20201221134820.24038-6-f.ebner@proxmox.com> From: Thomas Lamprecht In-Reply-To: <20201221134820.24038-6-f.ebner@proxmox.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-SPAM-LEVEL: Spam detection results: 0 AWL 1.586 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment NICE_REPLY_A -3.299 Looks like a legit reply (A) 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: Re: [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 14:56:54 -0000 On 21/12/2020 14:48, Fabian Ebner wrote: > 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 that's the sole real reason I'm not applying this just yet, please ping me if common got bumped and I forget this one. > > 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}}; I know the errors got out with warn already, but maybe we want to re-print them here, could be done with a extract-errors helper, which optionally takes a section and then prints out a "could not parse '$key'" or the like for all or the errors of that section, respectively - just as an idea... > 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', >