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 A987D8D07A for ; Mon, 7 Nov 2022 12:00:41 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 8D6022A2B3 for ; Mon, 7 Nov 2022 12:00:41 +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 for ; Mon, 7 Nov 2022 12:00:39 +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 80300421FC for ; Mon, 7 Nov 2022 12:00:39 +0100 (CET) From: Fiona Ebner To: pve-devel@lists.proxmox.com Date: Mon, 7 Nov 2022 12:00:35 +0100 Message-Id: <20221107110035.93972-2-f.ebner@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221107110035.93972-1-f.ebner@proxmox.com> References: <20221107110035.93972-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.028 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 SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH storage 2/2] zfs: list zvol: list single pool only for remote ZFS 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, 07 Nov 2022 11:00:41 -0000 The remote ZFS plugin doesn't use a cache (would need a separate cache for each target host), so this can speed up the operation. Signed-off-by: Fiona Ebner --- PVE/Storage/ZFSPlugin.pm | 2 +- PVE/Storage/ZFSPoolPlugin.pm | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/PVE/Storage/ZFSPlugin.pm b/PVE/Storage/ZFSPlugin.pm index 1379bcf..cd5a3b6 100644 --- a/PVE/Storage/ZFSPlugin.pm +++ b/PVE/Storage/ZFSPlugin.pm @@ -422,7 +422,7 @@ sub deactivate_volume { sub list_images { my ($class, $storeid, $scfg, $vmid, $vollist, $cache) = @_; - my $zfs_list = $class->zfs_list_zvol($scfg); + my $zfs_list = $class->zfs_list_zvol($scfg, 1); return $class->zfs_list_images($storeid, $scfg, $vmid, $vollist, $zfs_list); } diff --git a/PVE/Storage/ZFSPoolPlugin.pm b/PVE/Storage/ZFSPoolPlugin.pm index 0fa18ce..2f75fba 100644 --- a/PVE/Storage/ZFSPoolPlugin.pm +++ b/PVE/Storage/ZFSPoolPlugin.pm @@ -379,9 +379,11 @@ sub zfs_delete_zvol { } sub zfs_list_zvol { - my ($class, $scfg) = @_; + my ($class, $scfg, $single_pool) = @_; - my $text = $class->zfs_request($scfg, 10, 'list', '-o', 'name,volsize,origin,type,refquota', '-t', 'volume,filesystem', '-Hrp'); + my @param = ('-o', 'name,volsize,origin,type,refquota', '-t', 'volume,filesystem', '-Hrp'); + push @param, $scfg->{pool} if $single_pool; + my $text = $class->zfs_request($scfg, 10, 'list', @param); my $zvols = zfs_parse_zvol_list($text); return undef if !$zvols; -- 2.30.2