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) server-digest SHA256) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 20751AEBC for ; Fri, 8 Sep 2023 15:30:03 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 0D1731291C for ; Fri, 8 Sep 2023 15:30:03 +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 ; Fri, 8 Sep 2023 15:30:01 +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 2BFB14328F for ; Fri, 8 Sep 2023 15:30:01 +0200 (CEST) Message-ID: Date: Fri, 8 Sep 2023 15:30:00 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.15.0 Content-Language: en-US To: Thomas Lamprecht , Proxmox Backup Server development discussion References: <20230824124532.165700-1-g.goller@proxmox.com> From: Gabriel Goller In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.315 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 NICE_REPLY_A -1.473 Looks like a legit reply (A) SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: Re: [pbs-devel] [PATCH proxmox-backup v2] 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: Fri, 08 Sep 2023 13:30:03 -0000 On 9/7/23 18:11, Thomas Lamprecht wrote: > On 24/08/2023 14:45, Gabriel Goller wrote: >> 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. >> > seems OK now, but. > >> Signed-off-by: Gabriel Goller >> --- >> >> 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 | 21 ++++++++++++++++++--- >> 1 file changed, 18 insertions(+), 3 deletions(-) >> >> diff --git a/pbs-client/src/task_log.rs b/pbs-client/src/task_log.rs >> index 0bbb928d..a406a7a4 100644 >> --- a/pbs-client/src/task_log.rs >> +++ b/pbs-client/src/task_log.rs >> @@ -76,9 +76,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)); > I don't see how adding the new helper below and using it here is relevant to > what you want to accomplish as of your commit message? > > Please but such unrelated clean-ups in a separate patch. Relics from the previous patch ;) Removed it in the new series. >> } else { >> println!("{t}"); >> } >> @@ -96,6 +95,14 @@ 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") >> + && status_result["data"]["exitstatus"].as_str() != Some("OK") >> + { >> + bail!("task failed"); >> + } >> + >> Ok(()) >> }; >> >> @@ -127,3 +134,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 >> + } >> +}