From: Dominik Csapak <d.csapak@proxmox.com>
To: pve-devel@lists.proxmox.com, pbs-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH storage v3 1/1] api: FileRestore: decode and return proper error with new file-restore params
Date: Fri, 27 May 2022 10:22:02 +0200 [thread overview]
Message-ID: <20220527082203.1653182-3-d.csapak@proxmox.com> (raw)
In-Reply-To: <20220527082203.1653182-1-d.csapak@proxmox.com>
pbsclient now uses a timeout of 25 seconds do decode and return the error
if one is returned in json form.
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
PVE/API2/Storage/FileRestore.pm | 21 ++++++++++++++++-----
1 file changed, 16 insertions(+), 5 deletions(-)
diff --git a/PVE/API2/Storage/FileRestore.pm b/PVE/API2/Storage/FileRestore.pm
index 5630f52..7495e77 100644
--- a/PVE/API2/Storage/FileRestore.pm
+++ b/PVE/API2/Storage/FileRestore.pm
@@ -121,13 +121,24 @@ __PACKAGE__->register_method ({
my $client = PVE::PBSClient->new($scfg, $storeid);
my $ret = $client->file_restore_list([$scfg->{namespace}, $snap], $path, $base64);
- # 'leaf' is a proper JSON boolean, map to perl-y bool
- # TODO: make PBSClient decode all bools always as 1/0?
- foreach my $item (@$ret) {
- $item->{leaf} = $item->{leaf} ? 1 : 0;
+ if (ref($ret) eq "HASH") {
+ my $msg = $ret->{message};
+ if (my $code = $ret->{code}) {
+ die PVE::Exception->new("$msg\n", code => $code);
+ } else {
+ die "$msg\n";
+ }
+ } elsif (ref($ret) eq "ARRAY") {
+ # 'leaf' is a proper JSON boolean, map to perl-y bool
+ # TODO: make PBSClient decode all bools always as 1/0?
+ foreach my $item (@$ret) {
+ $item->{leaf} = $item->{leaf} ? 1 : 0;
+ }
+
+ return $ret;
}
- return $ret;
+ die "invalid proxmox-file-restore output";
}});
__PACKAGE__->register_method ({
--
2.30.2
next prev parent reply other threads:[~2022-05-27 8:22 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-27 8:22 [pve-devel] [PATCH common/storage/proxmxo-backup v3] improve file-restore timeout behaviour Dominik Csapak
2022-05-27 8:22 ` [pve-devel] [PATCH common v3 1/1] PBSClient: file_restore_list: add timeout parameter Dominik Csapak
2022-11-07 14:17 ` Thomas Lamprecht
2022-11-08 11:20 ` Dominik Csapak
2022-11-08 15:53 ` Thomas Lamprecht
2022-11-09 7:07 ` Dominik Csapak
2022-05-27 8:22 ` Dominik Csapak [this message]
2022-05-27 8:22 ` [pve-devel] [PATCH proxmox-backup v3 1/1] file-restore: remove 'json-error' parameter from list_files Dominik Csapak
2022-10-05 17:34 ` [pve-devel] applied: [pbs-devel] " Thomas Lamprecht
2022-10-25 10:17 ` [pve-devel] [PATCH common/storage/proxmxo-backup v3] improve file-restore timeout behaviour Dominik Csapak
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=20220527082203.1653182-3-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