From: Dominik Csapak <d.csapak@proxmox.com>
To: pve-devel@lists.proxmox.com, pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [PATCH storage v2 2/4] api2/storage/content: change to volume_size_info and add return properties
Date: Tue, 24 Nov 2020 10:09:31 +0100 [thread overview]
Message-ID: <20201124090936.21810-4-d.csapak@proxmox.com> (raw)
In-Reply-To: <20201124090936.21810-1-d.csapak@proxmox.com>
'file_size_info' only works for directory based storages, while
'volume_size_info' should work for all
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
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
next prev parent reply other threads:[~2020-11-24 9:09 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-24 9:09 [pbs-devel] [PATCH proxmox-backup/pve-storage/pve-manager v2] show/edit backup comments Dominik Csapak
2020-11-24 9:09 ` [pbs-devel] [PATCH proxmox-backup v2 1/1] client: add 'snapshot notes show/update' command Dominik Csapak
2020-11-24 9:52 ` [pbs-devel] [pve-devel] " Wolfgang Bumiller
2020-11-24 12:28 ` [pbs-devel] applied: " Dietmar Maurer
2020-11-24 9:09 ` [pbs-devel] [PATCH storage v2 1/4] rename comment to notes Dominik Csapak
2020-11-24 9:09 ` Dominik Csapak [this message]
2020-11-24 9:09 ` [pbs-devel] [PATCH storage v2 3/4] Storage/Plugin: add get/update_volume_comment and implement for dir Dominik Csapak
2020-11-24 9:09 ` [pbs-devel] [PATCH storage v2 4/4] Storage/PBSPlugin: implement get/update_volume_notes for pbs Dominik Csapak
2020-11-24 9:09 ` [pbs-devel] [PATCH manager v2 1/3] ui: change comment column to notes Dominik Csapak
2020-11-24 9:09 ` [pbs-devel] [PATCH manager v2 2/3] ui: add ability to show and edit comments for backups Dominik Csapak
2020-11-24 9:09 ` [pbs-devel] [PATCH manager v2 3/3] ui: enable notesedit for pbs Dominik Csapak
2021-03-25 8:22 ` [pbs-devel] applied: [pve-devel] " Thomas Lamprecht
2020-11-24 13:11 ` [pbs-devel] applied-partially: [pve-devel] [PATCH proxmox-backup/pve-storage/pve-manager v2] show/edit backup comments Thomas Lamprecht
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=20201124090936.21810-4-d.csapak@proxmox.com \
--to=d.csapak@proxmox.com \
--cc=pbs-devel@lists.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