From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id B8D36601A4 for ; Mon, 10 Jan 2022 12:29:22 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id AF5032F6 for ; Mon, 10 Jan 2022 12:29:22 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id E9AA52E7 for ; Mon, 10 Jan 2022 12:29:21 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id BD85046C30 for ; Mon, 10 Jan 2022 12:29:21 +0100 (CET) Message-ID: <5b40cca8-efc3-05d8-f00c-df8000c4b268@proxmox.com> Date: Mon, 10 Jan 2022 12:29:15 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.4.1 Content-Language: en-US To: pve-devel@lists.proxmox.com References: <20220110093400.39218-1-f.ebner@proxmox.com> From: Fabian Ebner In-Reply-To: <20220110093400.39218-1-f.ebner@proxmox.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.140 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment NICE_REPLY_A -0.001 Looks like a legit reply (A) SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: Re: [pve-devel] [PATCH storage] zfs: sorted snapshot list: use -r parameter X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Jan 2022 11:29:22 -0000 I'll send a v2, which does the same for volume_snapshot_info(). Am 10.01.22 um 10:34 schrieb Fabian Ebner: > Some versions of ZFS do not automatically display the child snapshots > when '-t snapshot' is used, but require '-r' to be present > additionally[1]. > > Because of that, commit ac5c1af led to a regression[0] in the context > of ZFS over iSCSI. Fix it, by adding a -r flag again. > > [0]: https://forum.proxmox.com/threads/102683/ > [1]: https://forum.proxmox.com/threads/102683/post-442577 > > Fixes: ac5c1af ("zfspool: add zfs_get_sorted_snapshot_list helper") > Signed-off-by: Fabian Ebner > --- > PVE/Storage/ZFSPoolPlugin.pm | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/PVE/Storage/ZFSPoolPlugin.pm b/PVE/Storage/ZFSPoolPlugin.pm > index 5f6befd..25cfdf3 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); >