yesBad/pve-storage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ZFS Pool: improve error output from activate_storage

Browse Source 
related to #2154 which has some issues on zpool list, but we do not
see the error messages from that step : Buggy "pvesm status" output
This commit is contained in:
Wolfgang Link
2019-04-16 15:18:22 +02:00
committed by Thomas Lamprecht
parent 4af7713268
commit dc18abe07b
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
PVE/Storage/ZFSPoolPlugin.pm
View File

@ -528,13 +528,16 @@ sub activate_storage {
eval { eval {
$res = $class->zfs_request($scfg, undef, 'zpool_list', @param); $res = $class->zfs_request($scfg, undef, 'zpool_list', @param);
}; };
my $err = $@;
if ($@ || !defined($res) || $res !~ $pool) { if ($err || !defined($res) || $res !~ $pool) {
eval { eval {
@param = ('-d', '/dev/disk/by-id/', '-o', 'cachefile=none', "$pool"); @param = ('-d', '/dev/disk/by-id/', '-o', 'cachefile=none', "$pool");
$class->zfs_request($scfg, undef, 'zpool_import', @param); $class->zfs_request($scfg, undef, 'zpool_import', @param);
}; };
die "could not activate storage '$storeid', $@\n" if $@; if ($@) {
warn "$err\n";
die "could not activate storage '$storeid', $@\n";
}
} }
return 1; return 1;
} }