[pve-devel] [PATCH v2 manager] vzdump: make parse error for storage critical

[pve-devel] [PATCH v2 manager] vzdump: make parse error for storage critical

[Fabian Ebner]

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 <f.ebner@proxmox.com>
---

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