From: "Fabian Grünbichler" <f.gruenbichler@proxmox.com>
To: Proxmox VE development discussion <pve-devel@lists.proxmox.com>
Subject: [pve-devel] applied: [PATCH v2 storage] zfs: use -r parameter when listing snapshots
Date: Mon, 10 Jan 2022 13:40:17 +0100 [thread overview]
Message-ID: <1641818366.stgo2cbaz0.astroid@nora.none> (raw)
In-Reply-To: <20220110115044.81215-1-f.ebner@proxmox.com>
thanks! (and a big 'huh?' to those implementations - not relevant for
us, but forcing '-r' to query snapshots seems rather strange..)
On January 10, 2022 12:50 pm, Fabian Ebner wrote:
> Some versions of ZFS do not automatically display the child snapshots
> when '-t snapshot' is used, but require '-r' to be present
> additionally[1]. And in general, it's cleaner to specify the flag
> explicitly.
>
> Because of that, commit ac5c1af led to a regression[0] in the context
> of ZFS over iSCSI with zfs_get_sorted_snapshot_list. Fix it, by adding
> a -r flag again.
>
> The volume_snapshot_info function is currently only used in the
> context of replication and that requires a local ZFS pool, but it
> would be affected by the same issue if it is ever used in the context
> of ZFS over iSCSI, so also add -r there.
>
> [0]: https://forum.proxmox.com/threads/102683/
> [1]: https://forum.proxmox.com/threads/102683/post-442577
>
> Fixes: 8c20d8a ("plugin: add volume_snapshot_info function")
> Fixes: ac5c1af ("zfspool: add zfs_get_sorted_snapshot_list helper")
> Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
> ---
>
> Changes from v1:
> * Add -r in volume_snapshot_info too.
>
> PVE/Storage/ZFSPoolPlugin.pm | 8 ++++++--
> 1 file changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/PVE/Storage/ZFSPoolPlugin.pm b/PVE/Storage/ZFSPoolPlugin.pm
> index 5f6befd..e952a5c 100644
> --- a/PVE/Storage/ZFSPoolPlugin.pm
> +++ b/PVE/Storage/ZFSPoolPlugin.pm
> @@ -398,9 +398,11 @@ sub zfs_list_zvol {
> sub zfs_get_sorted_snapshot_list {
> my ($class, $scfg, $volname, $sort_params) = @_;
>
> + my @params = ('-H', '-r', '-t', 'snapshot', '-o', 'name', $sort_params->@*);
> +
> my $vname = ($class->parse_volname($volname))[1];
> + push @params, "$scfg->{pool}\/$vname";
>
> - my @params = ('-H', '-t', 'snapshot', '-o', 'name', $sort_params->@*, "$scfg->{pool}\/$vname");
> my $text = $class->zfs_request($scfg, undef, 'list', @params);
> my @snapshots = split(/\n/, $text);
>
> @@ -513,9 +515,11 @@ sub volume_rollback_is_possible {
> sub volume_snapshot_info {
> my ($class, $scfg, $storeid, $volname) = @_;
>
> + my @params = ('-Hp', '-r', '-t', 'snapshot', '-o', 'name,guid,creation');
> +
> my $vname = ($class->parse_volname($volname))[1];
> + push @params, "$scfg->{pool}\/$vname";
>
> - my @params = ('-Hp', '-t', 'snapshot', '-o', 'name,guid,creation', "$scfg->{pool}\/$vname");
> my $text = $class->zfs_request($scfg, undef, 'list', @params);
> my @lines = split(/\n/, $text);
>
> --
> 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:[~2022-01-10 12:41 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-10 11:50 [pve-devel] " Fabian Ebner
2022-01-10 12:40 ` 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=1641818366.stgo2cbaz0.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