From: "Fabian Grünbichler" <f.gruenbichler@proxmox.com>
To: Proxmox VE development discussion <pve-devel@lists.proxmox.com>
Subject: [pve-devel] applied: [PATCH storage] zfs: fix unmount request
Date: Thu, 12 Aug 2021 11:55:30 +0200 [thread overview]
Message-ID: <1628762120.fbf2hskxtf.astroid@nora.none> (raw)
In-Reply-To: <20210805083343.31641-1-f.ebner@proxmox.com>
thanks!
On August 5, 2021 10:33 am, Fabian Ebner wrote:
> by not dying when the dataset is already unmounted. Can be triggered
> for a container by doing two rollbacks in a row.
>
> Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
> ---
> PVE/Storage/ZFSPoolPlugin.pm | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/PVE/Storage/ZFSPoolPlugin.pm b/PVE/Storage/ZFSPoolPlugin.pm
> index c4be70f..660b3d9 100644
> --- a/PVE/Storage/ZFSPoolPlugin.pm
> +++ b/PVE/Storage/ZFSPoolPlugin.pm
> @@ -477,7 +477,10 @@ sub volume_snapshot_rollback {
> # caches, they get mounted in activate volume again
> # see zfs bug #10931 https://github.com/openzfs/zfs/issues/10931
> if ($format eq 'subvol') {
> - $class->zfs_request($scfg, undef, 'unmount', "$scfg->{pool}/$vname");
> + eval { $class->zfs_request($scfg, undef, 'unmount', "$scfg->{pool}/$vname"); };
> + if (my $err = $@) {
> + die $err if $err !~ m/not currently mounted$/;
> + }
> }
>
> return $msg;
> --
> 2.30.2
>
>
>
> _______________________________________________
> pve-devel mailing list
> pve-devel@lists.proxmox.com
> https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
>
>
>
prev parent reply other threads:[~2021-08-12 9:56 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-05 8:33 [pve-devel] " Fabian Ebner
2021-08-12 9:55 ` Fabian Grünbichler [this message]
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=1628762120.fbf2hskxtf.astroid@nora.none \
--to=f.gruenbichler@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox