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

Gabriel Goller g.goller at proxmox.com
Wed Sep 27 17:32:27 CEST 2023


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

changes v3:
 - use exit code 0 (SUCCESS) on warning

changes v2:
 - removed unrelated cleanup

changes v1:
 - check on each iteration if the task is finished, then bubble up the 
   original error of the task. This was inpractical though, so we print
   the error and return a generic error.

 pbs-client/src/task_log.rs | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pbs-client/src/task_log.rs b/pbs-client/src/task_log.rs
index 0bbb928d..ba8c85b8 100644
--- a/pbs-client/src/task_log.rs
+++ b/pbs-client/src/task_log.rs
@@ -96,6 +96,16 @@ pub async fn display_task_log(
             }
         }
 
+        let status_path = format!("api2/json/nodes/localhost/tasks/{upid_encoded}/status");
+        let status_result = client.get(&status_path, None).await?;
+        if status_result["data"]["status"].as_str() == Some("stopped") {
+            if let Some(status) = status_result["data"]["exitstatus"].as_str() {
+                if status != "OK" && !status.starts_with("WARNINGS") {
+                    bail!("task failed");
+                }
+            }
+        }
+
         Ok(())
     };
 
-- 
2.39.2






More information about the pbs-devel mailing list