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 B14A462768; Tue, 24 Nov 2020 10:09:39 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id AD6B088C2; Tue, 24 Nov 2020 10:09:39 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (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 id BCD5A8887; Tue, 24 Nov 2020 10:09:37 +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 8D55D44077; Tue, 24 Nov 2020 10:09:37 +0100 (CET) From: Dominik Csapak To: pve-devel@lists.proxmox.com, pbs-devel@lists.proxmox.com Date: Tue, 24 Nov 2020 10:09:31 +0100 Message-Id: <20201124090936.21810-4-d.csapak@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201124090936.21810-1-d.csapak@proxmox.com> References: <20201124090936.21810-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.325 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [content.pm] Subject: [pve-devel] [PATCH storage v2 2/4] api2/storage/content: change to volume_size_info and add return properties 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: Tue, 24 Nov 2020 09:09:39 -0000 'file_size_info' only works for directory based storages, while 'volume_size_info' should work for all Signed-off-by: Dominik Csapak --- PVE/API2/Storage/Content.pm | 29 ++++++++++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/PVE/API2/Storage/Content.pm b/PVE/API2/Storage/Content.pm index d4e2392..7b81171 100644 --- a/PVE/API2/Storage/Content.pm +++ b/PVE/API2/Storage/Content.pm @@ -263,7 +263,30 @@ __PACKAGE__->register_method ({ }, }, }, - returns => { type => 'object' }, + returns => { + type => 'object', + properties => { + path => { + description => "The Path", + type => 'string', + }, + size => { + description => "Volume size in bytes.", + type => 'integer', + renderer => 'bytes', + }, + used => { + description => "Used space. Please note that most storage plugins " . + "do not report anything useful here.", + type => 'integer', + renderer => 'bytes', + }, + format => { + description => "Format identifier ('raw', 'qcow2', 'subvol', 'iso', 'tgz' ...)", + type => 'string', + }, + }, + }, code => sub { my ($param) = @_; @@ -277,8 +300,8 @@ __PACKAGE__->register_method ({ PVE::Storage::check_volume_access($rpcenv, $authuser, $cfg, undef, $volid); my $path = PVE::Storage::path($cfg, $volid); - my ($size, $format, $used, $parent) = PVE::Storage::file_size_info($path); - die "file_size_info on '$volid' failed\n" if !($format && $size); + my ($size, $format, $used, $parent) = PVE::Storage::volume_size_info($cfg, $volid); + die "volume_size_info on '$volid' failed\n" if !($format && $size); # fixme: return more attributes? return { -- 2.20.1