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 D124F1FF141 for ; Tue, 05 May 2026 16:16:17 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id A2E6F5018; Tue, 5 May 2026 16:16:16 +0200 (CEST) From: Nicolas Frey To: pbs-devel@lists.proxmox.com Subject: [PATCH proxmox-backup v2 2/2] fix #7541: zfs status: account for msg directly after status in vdev parser Date: Tue, 5 May 2026 16:16:06 +0200 Message-ID: <20260505141606.438908-3-n.frey@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260505141606.438908-1-n.frey@proxmox.com> References: <20260505141606.438908-1-n.frey@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.124 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 KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods RDNS_NONE 0.793 Delivered to internal network by a host with no rDNS SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_NONE 0.001 SPF: sender does not publish an SPF Record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [proxmox.com] Message-ID-Hash: JZ7KLSQ6Y4ZIL6SDGNW4E7XAHHRXUSRE X-Message-ID-Hash: JZ7KLSQ6Y4ZIL6SDGNW4E7XAHHRXUSRE X-MailFrom: nfrey@miso.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: so spares that have the status `INUSE` parse correctly. adds a line to the mock config in the `test_zpool_status_parser_spares` test containing an example of a vdev that would be `INUSE`. Fixes: https://bugzilla.proxmox.com/show_bug.cgi?id=7541 Signed-off-by: Nicolas Frey --- No functional changes since v1 src/tools/disks/zpool_status.rs | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/src/tools/disks/zpool_status.rs b/src/tools/disks/zpool_status.rs index 9427f6d4..267fb916 100644 --- a/src/tools/disks/zpool_status.rs +++ b/src/tools/disks/zpool_status.rs @@ -14,7 +14,7 @@ use nom::{ character::complete::line_ending, combinator::opt, multi::{many0, many1}, - sequence::preceded, + sequence::{preceded, tuple}, }; #[derive(Debug, Serialize, Deserialize)] @@ -68,29 +68,33 @@ fn parse_zpool_status_vdev(i: &str) -> IResult<&str, ZFSPoolVDevState> { } let (i, state) = preceded(multispace1, notspace1)(i)?; - if let Ok((n, _)) = preceded(multispace0, line_ending)(i) { - // spares + if let Ok((n, (read, write, cksum, msg, _))) = tuple(( + preceded(multispace1, parse_u64), + preceded(multispace1, parse_u64), + preceded(multispace1, parse_u64), + opt(preceded(multispace1, take_while1(|c: char| c != '\n'))), + line_ending, + ))(i) + { let vdev = ZFSPoolVDevState { name: vdev_name.to_string(), lvl: indent_level, state: Some(state.to_string()), - stats: None, - msg: None, + stats: Some(VDevStats { read, write, cksum }), + msg: msg.map(String::from), }; return Ok((n, vdev)); } - let (i, read) = preceded(multispace1, parse_u64)(i)?; - let (i, write) = preceded(multispace1, parse_u64)(i)?; - let (i, cksum) = preceded(multispace1, parse_u64)(i)?; - let (i, msg) = opt(preceded(multispace1, take_while(|c| c != '\n')))(i)?; + // spares + let (i, msg) = opt(preceded(multispace1, take_while1(|c: char| c != '\n')))(i)?; let (i, _) = line_ending(i)?; let vdev = ZFSPoolVDevState { name: vdev_name.to_string(), lvl: indent_level, state: Some(state.to_string()), - stats: Some(VDevStats { read, write, cksum }), + stats: None, msg: msg.map(String::from), }; @@ -486,6 +490,7 @@ config: spares /dev/sdb AVAIL /dev/sdc AVAIL + /dev/sdd INUSE currently in use errors: No known data errors "###; -- 2.47.3