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 AB7368A52 for ; Mon, 6 Mar 2023 14:08:44 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 857D818F0 for ; Mon, 6 Mar 2023 14:08:14 +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) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Mon, 6 Mar 2023 14:08:12 +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 55ACE41DD9 for ; Mon, 6 Mar 2023 14:08:12 +0100 (CET) From: Christian Ebner To: pve-devel@lists.proxmox.com Date: Mon, 6 Mar 2023 14:07:52 +0100 Message-Id: <20230306130752.1112199-1-c.ebner@proxmox.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.130 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 POISEN_SPAM_PILL 0.1 Meta: its spam POISEN_SPAM_PILL_1 0.1 random spam to be learned in bayes POISEN_SPAM_PILL_3 0.1 random spam to be learned in bayes 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 v2 storage] api: fix get content call for volumes 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, 06 Mar 2023 13:08:44 -0000 `pvesh get /nodes/{node}/storage/{storage}/content/{volume}` failed for several storage types, because the respective storage plugins returned only the volumes `size` on `volume_size_info` calls, while also the format is required. This patch fixes the issue by returning also `format` and where possible `used`. The issue was reported in the forum: https://forum.proxmox.com/threads/pvesh-get-nodes-node-storage-storage-content-volume-returns-error.123747/ Signed-off-by: Christian Ebner --- Changes since v1: * Remove errous check for $used being set, rely on fallback to 0 if undef * Return `parent` for RBD and ZFS * Return `used` for ZFS PVE/Storage/ISCSIDirectPlugin.pm | 2 +- PVE/Storage/RBDPlugin.pm | 4 ++-- PVE/Storage/ZFSPoolPlugin.pm | 8 ++++++-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/PVE/Storage/ISCSIDirectPlugin.pm b/PVE/Storage/ISCSIDirectPlugin.pm index 9777969..eb329d4 100644 --- a/PVE/Storage/ISCSIDirectPlugin.pm +++ b/PVE/Storage/ISCSIDirectPlugin.pm @@ -208,7 +208,7 @@ sub volume_size_info { my $vollist = iscsi_ls($scfg,$storeid); my $info = $vollist->{$storeid}->{$volname}; - return $info->{size}; + return wantarray ? ($info->{size}, 'raw', 0, undef) : $info->{size}; } sub volume_resize { diff --git a/PVE/Storage/RBDPlugin.pm b/PVE/Storage/RBDPlugin.pm index 9047504..e7a2137 100644 --- a/PVE/Storage/RBDPlugin.pm +++ b/PVE/Storage/RBDPlugin.pm @@ -729,8 +729,8 @@ sub volume_size_info { my ($class, $scfg, $storeid, $volname, $timeout) = @_; my ($vtype, $name, $vmid) = $class->parse_volname($volname); - my ($size, undef) = rbd_volume_info($scfg, $storeid, $name); - return $size; + my ($size, $parent) = rbd_volume_info($scfg, $storeid, $name); + return wantarray ? ($size, 'raw', 0, $parent) : $size; } sub volume_resize { diff --git a/PVE/Storage/ZFSPoolPlugin.pm b/PVE/Storage/ZFSPoolPlugin.pm index 9fbd149..acc50d9 100644 --- a/PVE/Storage/ZFSPoolPlugin.pm +++ b/PVE/Storage/ZFSPoolPlugin.pm @@ -446,13 +446,17 @@ sub status { sub volume_size_info { my ($class, $scfg, $storeid, $volname, $timeout) = @_; - my (undef, $vname, undef, undef, undef, undef, $format) = + my (undef, $vname, undef, $parent, undef, undef, $format) = $class->parse_volname($volname); my $attr = $format eq 'subvol' ? 'refquota' : 'volsize'; my $value = $class->zfs_get_properties($scfg, $attr, "$scfg->{pool}/$vname"); + my $used = $class->zfs_get_properties($scfg, 'used', "$scfg->{pool}/$vname"); + + $used = ($used =~ /^(\d+)$/) ? $1 : 0; + if ($value =~ /^(\d+)$/) { - return $1; + return wantarray ? ($1, $format, $used, $parent) : $1; } die "Could not get zfs volume size\n"; -- 2.30.2