[pbs-devel] [PATCH proxmox-backup] fix #4343: updated `view_task_result` to bail on task failure

[Gabriel Goller]

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 at 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