* [pve-devel] [PATCH storage] fix regression in zfs volume activation
@ 2020-09-29 16:49 Stoiko Ivanov
2020-09-29 16:59 ` [pve-devel] applied: " Thomas Lamprecht
0 siblings, 1 reply; 2+ messages in thread
From: Stoiko Ivanov @ 2020-09-29 16:49 UTC (permalink / raw)
To: pve-devel; +Cc: Thomas Lamprecht
commit 815df2dd08ac4c7295135262e60d64fbb57b8f5c 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>
---
PVE/Storage/ZFSPoolPlugin.pm | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/PVE/Storage/ZFSPoolPlugin.pm b/PVE/Storage/ZFSPoolPlugin.pm
index 4f8df5e..6ac05b4 100644
--- a/PVE/Storage/ZFSPoolPlugin.pm
+++ b/PVE/Storage/ZFSPoolPlugin.pm
@@ -554,9 +554,10 @@ sub activate_volume {
if ($format eq 'raw') {
$class->zfs_wait_for_zvol_link($scfg, $volname);
} 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$/) {
- $class->zfs_request($scfg, undef, 'mount', "$scfg->{pool}/$volname");
+ $class->zfs_request($scfg, undef, 'mount', "$path");
}
}
--
2.20.1
^ permalink raw reply [flat|nested] 2+ messages in thread* [pve-devel] applied: [PATCH storage] fix regression in zfs volume activation
2020-09-29 16:49 [pve-devel] [PATCH storage] fix regression in zfs volume activation Stoiko Ivanov
@ 2020-09-29 16:59 ` Thomas Lamprecht
0 siblings, 0 replies; 2+ messages in thread
From: Thomas Lamprecht @ 2020-09-29 16:59 UTC (permalink / raw)
To: Proxmox VE development discussion, Stoiko Ivanov
On 29.09.20 18:49, Stoiko Ivanov wrote:
> commit 815df2dd08ac4c7295135262e60d64fbb57b8f5c 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>
> ---
> PVE/Storage/ZFSPoolPlugin.pm | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
>
applied, thanks!
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-09-29 16:59 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-09-29 16:49 [pve-devel] [PATCH storage] fix regression in zfs volume activation Stoiko Ivanov
2020-09-29 16:59 ` [pve-devel] applied: " Thomas Lamprecht
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox