From: Gabriel Goller <g.goller@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [PATCH proxmox-backup] fix #4343: updated `view_task_result` to bail on task failure
Date: Tue, 22 Aug 2023 12:36:03 +0200 [thread overview]
Message-ID: <20230822103603.130998-1-g.goller@proxmox.com> (raw)
Now we make an additional request on `api2/json/.../tasks/{upid}/status` to
get the `exitstatus` of the task. This allows us to `bail` and thus
get a non-zero exit code in the cli.
Signed-off-by: Gabriel Goller <g.goller@proxmox.com>
---
pbs-client/src/task_log.rs | 27 ++++++++++++++++++++++++---
1 file changed, 24 insertions(+), 3 deletions(-)
diff --git a/pbs-client/src/task_log.rs b/pbs-client/src/task_log.rs
index 0bbb928d..4fb31fea 100644
--- a/pbs-client/src/task_log.rs
+++ b/pbs-client/src/task_log.rs
@@ -64,10 +64,24 @@ pub async fn display_task_log(
let path = format!("api2/json/nodes/localhost/tasks/{upid_encoded}/log");
let result = client.get(&path, Some(param)).await?;
+ let status_path = format!("api2/json/nodes/localhost/tasks/{upid_encoded}/status");
+ let status_result = client.get(&status_path, None).await?;
+
let active = result["active"].as_bool().unwrap();
let total = result["total"].as_u64().unwrap();
let data = result["data"].as_array().unwrap();
+ if status_result["data"]["status"].as_str() == Some("stopped")
+ && status_result["data"]["exitstatus"].as_str() != Some("OK")
+ {
+ bail!(
+ "{}",
+ data.iter()
+ .map(|d| try_strip_date(d["t"].as_str().unwrap()))
+ .fold(String::new(), |a, b| a + " " + b)
+ );
+ }
+
let lines = data.len();
for item in data {
@@ -76,9 +90,8 @@ pub async fn display_task_log(
if n != start {
bail!("got wrong line number in response data ({n} != {start}");
}
- if strip_date && t.len() > 27 && &t[25..27] == ": " {
- let line = &t[27..];
- println!("{line}");
+ if strip_date {
+ println!("{}", try_strip_date(t));
} else {
println!("{t}");
}
@@ -127,3 +140,11 @@ pub async fn view_task_result(
Ok(())
}
+
+fn try_strip_date(log_msg: &str) -> &str {
+ if log_msg.len() > 27 && &log_msg[25..27] == ": " {
+ &log_msg[27..]
+ } else {
+ log_msg
+ }
+}
--
2.39.2
next reply other threads:[~2023-08-22 10:36 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-22 10:36 Gabriel Goller [this message]
2023-08-24 8:57 ` Wolfgang Bumiller
2023-08-24 9:01 ` Wolfgang Bumiller
2023-08-24 12:47 ` Gabriel Goller
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=20230822103603.130998-1-g.goller@proxmox.com \
--to=g.goller@proxmox.com \
--cc=pbs-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal