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

fix regression in zfs volume activation

Browse Source 
commit 815df2dd08 introduced a small issue
when activating linked clone volumes - the volname passed contains
basevol/subvol, which needs to be translated to subvol.

using the path method should be a robust way to get the actual path for
activation.

Found and tested by building the package as root (otherwise the zfs
regressiontests are skipped).

Reported-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
This commit is contained in:
Stoiko Ivanov
2020-09-29 18:49:44 +02:00
committed by Thomas Lamprecht
parent e3eb131ec5
commit 59fdc2b71e
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
PVE/Storage/ZFSPoolPlugin.pm
View File

@ -554,9 +554,10 @@ sub activate_volume {
if ($format eq 'raw') { if ($format eq 'raw') {
$class->zfs_wait_for_zvol_link($scfg, $volname); $class->zfs_wait_for_zvol_link($scfg, $volname);
} elsif ($format eq 'subvol') { } elsif ($format eq 'subvol') {
my $mounted = $class->zfs_get_properties($scfg, 'mounted', "$scfg->{pool}/$volname"); my ($path, undef, undef) = $class->path($scfg, $volname, $storeid);
my $mounted = $class->zfs_get_properties($scfg, 'mounted', "$path");
if ($mounted !~ m/^yes$/) { if ($mounted !~ m/^yes$/) {
$class->zfs_request($scfg, undef, 'mount', "$scfg->{pool}/$volname"); $class->zfs_request($scfg, undef, 'mount', "$path");
} }
} }