From: Thomas Lamprecht <t.lamprecht@proxmox.com>
To: Proxmox VE development discussion <pve-devel@lists.proxmox.com>,
Dominik Csapak <d.csapak@proxmox.com>,
pbs-devel@lists.proxmox.com
Subject: [pve-devel] applied: [PATCH storage v4 1/3] api: FileRestore: decode and return proper error of file-restore listing
Date: Tue, 15 Nov 2022 13:27:47 +0100 [thread overview]
Message-ID: <7ba55d71-8511-9016-6705-e0065023ae9c@proxmox.com> (raw)
In-Reply-To: <20221110103634.2177856-5-d.csapak@proxmox.com>
Am 10/11/2022 um 11:36 schrieb Dominik Csapak:
> since commit
> ba690c40 ("file-restore: remove 'json-error' parameter from list_files")
>
> in proxmox-backup, the file-restore binary will return the error as json
> when called with '--output-format json' (which we do in PVE::PBSClient)
>
> here, we assume that 'file-restore' will fail in that case, and we try
> to use the return value as an array ref which fails, and the user never
> sees the real error message.
>
> To fix that, check the ref type of the return value and act accordingly
>
> Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
> ---
> no changes from v3
> does not depend on rest of series
> fixes error output
>
> PVE/API2/Storage/FileRestore.pm | 21 ++++++++++++++++-----
> 1 file changed, 16 insertions(+), 5 deletions(-)
>
>
applied, thanks!
next prev parent reply other threads:[~2022-11-15 12:27 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-10 10:36 [pve-devel] [PATCH proxmox-backup/common/storage v4] improve file-restore timeout behaviour Dominik Csapak
2022-11-10 10:36 ` [pve-devel] [PATCH proxmox-backup v4 1/1] file-restore: make dynamic memory behaviour controllable Dominik Csapak
2022-11-15 8:29 ` [pve-devel] applied: [pbs-devel] " Thomas Lamprecht
2022-11-10 10:36 ` [pve-devel] [PATCH common v4 1/2] PBSClient: file_restore_list: add extraParams and use timeout Dominik Csapak
2022-11-15 12:27 ` [pve-devel] applied: " Thomas Lamprecht
2022-11-10 10:36 ` [pve-devel] [PATCH common v4 2/2] PBSClient: add optional 'dynamic-memory' parameter to file-restore commands Dominik Csapak
2022-11-10 10:36 ` [pve-devel] [PATCH storage v4 1/3] api: FileRestore: decode and return proper error of file-restore listing Dominik Csapak
2022-11-15 12:27 ` Thomas Lamprecht [this message]
2022-11-10 10:36 ` [pve-devel] [PATCH storage v4 2/3] api: FileRestore: make use of file-restores and guis timeout mechanism Dominik Csapak
2022-11-15 12:28 ` [pve-devel] applied: " Thomas Lamprecht
2022-11-10 10:36 ` [pve-devel] [PATCH storage v4 3/3] api: FileRestore: allow automatic memory increase for privileged users 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=7ba55d71-8511-9016-6705-e0065023ae9c@proxmox.com \
--to=t.lamprecht@proxmox.com \
--cc=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