From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 14ACCECA3 for ; Wed, 27 Sep 2023 17:32:33 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id EEF7BE154 for ; Wed, 27 Sep 2023 17:32:32 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Wed, 27 Sep 2023 17:32:32 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 432AD48E44 for ; Wed, 27 Sep 2023 17:32:32 +0200 (CEST) From: Gabriel Goller To: pbs-devel@lists.proxmox.com Date: Wed, 27 Sep 2023 17:32:27 +0200 Message-Id: <20230927153227.256298-1-g.goller@proxmox.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.373 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pbs-devel] [PATCH proxmox-backup v4] fix #4343: updated `view_task_result` to bail on task failure X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Sep 2023 15:32:33 -0000 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 --- 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