From: Dominik Csapak <d.csapak@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH proxmox-backup 5/5] file-restore: add 'timeout' and 'json-error' parameter
Date: Thu, 27 Jan 2022 11:55:58 +0100 [thread overview]
Message-ID: <20220127105601.2741602-6-d.csapak@proxmox.com> (raw)
In-Reply-To: <20220127105601.2741602-1-d.csapak@proxmox.com>
timeout limits the code with the given timeout in seconds, and
'json-error' return json to stdout when the call returns an error like
this:
{
"msg": "error message",
"error": true,
"code": <HTTP_STATUS_CODE>, // if it was an http error
}
with both options set, a client can more easily determine if the call
ran into a timeout (since it will return a 503 error), and can poll
it again
both is done behind new parameters, so that we can stay backwards-compatible
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
proxmox-file-restore/src/main.rs | 53 ++++++++++++++++++++++++++++++--
1 file changed, 51 insertions(+), 2 deletions(-)
diff --git a/proxmox-file-restore/src/main.rs b/proxmox-file-restore/src/main.rs
index cbf79802..16c197a9 100644
--- a/proxmox-file-restore/src/main.rs
+++ b/proxmox-file-restore/src/main.rs
@@ -7,6 +7,7 @@ use anyhow::{bail, format_err, Error};
use serde_json::{json, Value};
use proxmox_sys::fs::{create_path, CreateOptions};
+use proxmox_router::{http_err, HttpError};
use proxmox_router::cli::{
complete_file_name, default_table_format_options,
format_and_print_result_full, get_output_format,
@@ -213,6 +214,18 @@ async fn list_files(
schema: OUTPUT_FORMAT,
optional: true,
},
+ "json-error": {
+ type: Boolean,
+ description: "If set, errors are returned as json instead of writing to stderr",
+ optional: true,
+ default: false,
+ },
+ "timeout": {
+ type: Integer,
+ description: "Defines the maximum time the call can should take.",
+ minimum: 1,
+ optional: true,
+ },
}
},
returns: {
@@ -228,6 +241,8 @@ async fn list(
snapshot: String,
path: String,
base64: bool,
+ json_error: bool,
+ timeout: Option<u64>,
param: Value,
) -> Result<(), Error> {
let repo = extract_repository_from_value(¶m)?;
@@ -253,10 +268,44 @@ async fn list(
None => None,
};
- let result = list_files(repo, snapshot, path, crypt_config, keyfile, driver).await?;
+ let result = if let Some(timeout) = timeout {
+ match tokio::time::timeout(
+ std::time::Duration::from_secs(timeout),
+ list_files(repo, snapshot, path, crypt_config, keyfile, driver),
+ )
+ .await
+ {
+ Ok(res) => res,
+ Err(_) => Err(http_err!(SERVICE_UNAVAILABLE, "list not finished in time")),
+ }
+ } else {
+ list_files(repo, snapshot, path, crypt_config, keyfile, driver).await
+ };
let output_format = get_output_format(¶m);
+ if let Err(err) = result {
+ if !json_error {
+ return Err(err);
+ }
+ let (msg, code) = match err.downcast_ref::<HttpError>() {
+ Some(HttpError { code, message }) => (message.clone(), Some(code)),
+ None => (err.to_string(), None),
+ };
+ let mut json_err = json!({
+ "error": true,
+ "message": msg,
+ });
+ if let Some(code) = code {
+ json_err["code"] = Value::from(code.as_u16());
+ }
+ match output_format.as_ref() {
+ "json-pretty" => println!("{}", serde_json::to_string_pretty(&json_err)?),
+ _ => println!("{}", serde_json::to_string(&json_err)?),
+ }
+ return Ok(());
+ }
+
let options = default_table_format_options()
.sortby("type", false)
.sortby("text", false)
@@ -266,7 +315,7 @@ async fn list(
.column(ColumnConfig::new("size"));
format_and_print_result_full(
- &mut json!(result),
+ &mut json!(result.unwrap()),
&API_METHOD_LIST.returns,
&output_format,
&options,
--
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 ` Dominik Csapak [this message]
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 ` [pve-devel] [PATCH storage 1/1] api: FileRestore: use new timeout and json-error parameters for list Dominik Csapak
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-6-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