From: Fabian Ebner <f.ebner@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH v2 storage] ZFS: mount subvols in activate_volume
Date: Mon, 28 Sep 2020 11:48:37 +0200 [thread overview]
Message-ID: <20200928094837.26162-1-f.ebner@proxmox.com> (raw)
Makes it possible to clone and start a container whose
ZFS subvols are not yet mounted for some reason. If a
subvol cannot be mounted, there's a better error now:
zfs error: cannot mount '/myzpool/subvol-103-disk-0': directory is not empty
Previously, cloning would quietly do an "empty" clone,
and startup would fail with:
mount_autodev: 1074 Permission denied - Failed to create "/dev" directory
lxc_setup: 3238 Failed to mount "/dev"
do_start: 1224 Failed to setup container "103"
__sync_wait: 41 An error occurred in another process (expected sequence number 5)
Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
---
Changes from v1:
* not a change in this patch, but important:
commit e8bb92bd2b1af95fd20db1b4aeb3dabc2811f571 moved volume activation
to vm_start, meaning that the mount operation introduced by this patch
does not happen (and fail) in the restricted apparmor context anymore
* adapt commit message to reflect current behavior (when the first version
was sent, starting failed quietly without producing an error)
* rebase against current master
Previous discussion:
https://lists.proxmox.com/pipermail/pve-devel/2020-April/043088.html
PVE/Storage/ZFSPoolPlugin.pm | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/PVE/Storage/ZFSPoolPlugin.pm b/PVE/Storage/ZFSPoolPlugin.pm
index 7c180ea..215b703 100644
--- a/PVE/Storage/ZFSPoolPlugin.pm
+++ b/PVE/Storage/ZFSPoolPlugin.pm
@@ -549,9 +549,14 @@ sub activate_volume {
my (undef, undef, undef, undef, undef, undef, $format) = $class->parse_volname($volname);
- return 1 if $format ne 'raw';
-
- $class->zfs_wait_for_zvol_link($scfg, $volname);
+ 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");
+ if ($mounted !~ m/^yes$/) {
+ $class->zfs_request($scfg, undef, 'mount', "$scfg->{pool}/$volname");
+ }
+ }
return 1;
}
--
2.20.1
next reply other threads:[~2020-09-28 9:48 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-28 9:48 Fabian Ebner [this message]
2020-09-29 3:09 ` [pve-devel] applied: " Thomas Lamprecht
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200928094837.26162-1-f.ebner@proxmox.com \
--to=f.ebner@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal