From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id BC9D41FF191 for ; Mon, 2 Jun 2025 11:48:19 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 070641EEE3; Mon, 2 Jun 2025 11:48:04 +0200 (CEST) From: Stoiko Ivanov To: pbs-devel@lists.proxmox.com, pve-devel@lists.proxmox.com Date: Mon, 2 Jun 2025 11:47:56 +0200 Message-Id: <20250602094756.519927-7-s.ivanov@proxmox.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250602094756.519927-1-s.ivanov@proxmox.com> References: <20250602094756.519927-1-s.ivanov@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.063 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: [pve-devel] [PATCH proxmox-backup 1/1] restore-daemon: adapt to zpool output changes in 2.3 X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" the output of `zpool import` has changed, thus our current parser failed to find a zpool with zfs userspace in version 2.3.2. While ZFS 2.3 introduced JSON output for many commands `zpool import` still lacks the option [0], thus I'd postpone this adapation once all needed zfs/zpool commands provide JSON. the change was probably introduced in zfs upstream commit: 5137c132a ("zpool import output is not formated properly.") [0] https://github.com/openzfs/zfs/issues/17084 Signed-off-by: Stoiko Ivanov --- proxmox-restore-daemon/src/proxmox_restore_daemon/disk.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proxmox-restore-daemon/src/proxmox_restore_daemon/disk.rs b/proxmox-restore-daemon/src/proxmox_restore_daemon/disk.rs index 50fbf315..e068ab9b 100644 --- a/proxmox-restore-daemon/src/proxmox_restore_daemon/disk.rs +++ b/proxmox-restore-daemon/src/proxmox_restore_daemon/disk.rs @@ -17,7 +17,7 @@ use pbs_api_types::BLOCKDEVICE_NAME_REGEX; const_regex! { VIRTIO_PART_REGEX = r"^vd[a-z]+(\d+)$"; - ZPOOL_POOL_NAME_REGEX = r"^ {3}pool: (.*)$"; + ZPOOL_POOL_NAME_REGEX = r"^ {2,3}pool: (.*)$"; ZPOOL_IMPORT_DISK_REGEX = r"^\t {2,4}(vd[a-z]+(?:\d+)?)\s+ONLINE$"; } -- 2.39.5 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel