From: Dominik Csapak <d.csapak@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH storage 1/1] api: FileRestore: use new timeout and json-error parameters for list
Date: Thu, 27 Jan 2022 11:56:00 +0100 [thread overview]
Message-ID: <20220127105601.2741602-8-d.csapak@proxmox.com> (raw)
In-Reply-To: <20220127105601.2741602-1-d.csapak@proxmox.com>
use a timeout of 25 seconds (5 seconds headroom for pveproxys 30s timeout)
and 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 | 27 ++++++++++++++++++++-------
1 file changed, 20 insertions(+), 7 deletions(-)
diff --git a/PVE/API2/Storage/FileRestore.pm b/PVE/API2/Storage/FileRestore.pm
index a4bad44..8d241d0 100644
--- a/PVE/API2/Storage/FileRestore.pm
+++ b/PVE/API2/Storage/FileRestore.pm
@@ -121,15 +121,28 @@ __PACKAGE__->register_method ({
if $vtype ne 'backup';
my $client = PVE::PBSClient->new($scfg, $storeid);
- my $ret = $client->file_restore_list($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;
+ my $ret = $client->file_restore_list($snap, $path, $base64, ['--json-error', 1, '--timeout', 25]);
+
+ if (ref($ret) eq "HASH") {
+ my $msg = $ret->{message};
+ if ($ret->{error}) {
+ 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-01-27 10:56 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-27 10:55 [pve-devel] [PATCH proxmox-backup/common/storage/wt] improve file-restore timeout behaviour Dominik Csapak
2022-01-27 10:55 ` [pve-devel] [PATCH proxmox-backup 1/5] restore-daemon: start disk initialization in parallel to the api Dominik Csapak
2022-01-27 10:55 ` [pve-devel] [PATCH proxmox-backup 2/5] restore-daemon: put blocking code into 'block_in_place' Dominik Csapak
2022-01-27 10:55 ` [pve-devel] [PATCH proxmox-backup 3/5] restore-daemon: avoid auto-mounting zpools Dominik Csapak
2022-01-27 10:55 ` [pve-devel] [PATCH proxmox-backup 4/5] file-restore: factor out 'list_files' Dominik Csapak
2022-01-27 10:55 ` [pve-devel] [PATCH proxmox-backup 5/5] file-restore: add 'timeout' and 'json-error' parameter Dominik Csapak
2022-01-27 10:55 ` [pve-devel] [PATCH common 1/1] PBSClient: add option for extra parameter to file_restore_list Dominik Csapak
2022-02-09 17:35 ` Thomas Lamprecht
2022-02-10 8:30 ` Wolfgang Bumiller
2022-01-27 10:56 ` Dominik Csapak [this message]
2022-01-27 10:56 ` [pve-devel] [PATCH widget-toolkit 1/1] window/FileBrowser: try reload again when getting a 503 error 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=20220127105601.2741602-8-d.csapak@proxmox.com \
--to=d.csapak@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