From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 5544B1FF141 for ; Mon, 13 Apr 2026 15:02:26 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 691C424996; Mon, 13 Apr 2026 15:03:14 +0200 (CEST) Mime-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=UTF-8 Date: Mon, 13 Apr 2026 15:02:41 +0200 Message-Id: Subject: Re: [PATCH proxmox-backup v4 2/3] fix #7400: api: gracefully handle corrupted job statefiles To: =?utf-8?q?Michael_K=C3=B6ppl?= , X-Mailer: aerc 0.20.0 References: <20260403132628.210128-1-m.koeppl@proxmox.com> <20260403132628.210128-3-m.koeppl@proxmox.com> In-Reply-To: From: "Shannon Sterz" X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1776085287737 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.123 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 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Message-ID-Hash: JL5D3FUADKLHJOVYNYSRK2Q247SBEK3H X-Message-ID-Hash: JL5D3FUADKLHJOVYNYSRK2Q247SBEK3H X-MailFrom: s.sterz@proxmox.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox Backup Server development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: -->8 snip 8<-- >>> @@ -191,11 +197,23 @@ impl JobState { >>> /// This does not update the state in the file. >>> pub fn load(jobtype: &str, jobname: &str) -> Result { >>> if let Some(state) =3D file_read_optional_string(get_path(jobt= ype, jobname))? { >>> - match serde_json::from_str(&state)? { >>> + let job_state =3D match serde_json::from_str(&state) { >>> + Ok(parsed_state) =3D> parsed_state, >>> + Err(err) =3D> { >>> + log::error!("could not parse statefile for {jobnam= e}: {err}"); >>> + return Ok(JobState::Unknown); >>> + } >> >> kind of a stylistic choice, but i think the following might be slightly >> neater here: >> >> ``` >> let Ok(job_sate) =3D serde_json::from_str(&state) else { >> log::error!("could not parse statefile for {jobname}: {err}"); >> return Ok(JobState::Unknown); >> } >> ``` > > AFAIK there's no way to get the error with let-else? It's why I chose > the regular approach with match. > ah yeah sorry, missed that. and yeah true, you can't do that without assigning the return value of the `from_str` call in between. -->8 snip 8<--