[pve-devel] [PATCH storage] close #1949: storage zfs: enhanced zpool status parser

[Tim Marx]

changed the behavior which originally only parsed the used vdevs from a pool.
with this revision spare-, cache- and log-disks are parsed as well.

*removed a unused local var vdevs
*changed return value name to errors (I think that was a copy&past leftover)
*changed usage of $1 to meaningful name $spaces

we need to change the frontend as well, because of some missing fields when 
parsing spare disk (no state description.. ), I will do this in a follow up.
Regarding the frontend, we could display some additional infos as well like
errors and scan. As for now there is only a msg field for device specific 
messages. what do you think?

Signed-off-by: Tim Marx <t.marx at proxmox.com>
---
 PVE/API2/Disks/ZFS.pm | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/PVE/API2/Disks/ZFS.pm b/PVE/API2/Disks/ZFS.pm
index 371cc5a..898dafc 100644
--- a/PVE/API2/Disks/ZFS.pm
+++ b/PVE/API2/Disks/ZFS.pm
@@ -165,7 +165,7 @@ __PACKAGE__->register_method ({
 		type => 'string',
 		description => 'Information about the last/current scrub.',
 	    },
-	    scan => {
+	    errors => {
 		type => 'string',
 		description => 'Information about the errors on the zpool.',
 	    },
@@ -213,7 +213,6 @@ __PACKAGE__->register_method ({
 	my $pool = {
 	    lvl => 0,
 	};
-	my $vdevs = [];
 
 	my $curfield;
 	my $config = 0;
@@ -233,10 +232,10 @@ __PACKAGE__->register_method ({
 		$pool->{$curfield} .= " " . $1;
 	    } elsif (!$config && $line =~ m/^\s*config:/) {
 		$config = 1;
-	    } elsif ($config && $line =~ m/^(\s+)(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s*(.*)$/) {
+	    } elsif ($config && $line =~ m/^(\s+)(\S+)\s*(\S*)\s*(\S*)\s*(\S*)\s*(\S*)\s*(.*)$/) {
 		my ($space, $name, $state, $read, $write, $cksum, $msg) = ($1, $2, $3, $4, $5, $6, $7);
-		if ($space  =~ m/^\t(\s+)$/) {
-		    my $lvl= length($1)/2; # two spaces per level
+		if ($name ne "NAME" and $name ne $param->{name}) {
+		    my $lvl= length($space)/2; # two spaces per level
 		    my $vdev = {
 			name => $name,
 			state => $state,
-- 
2.11.0