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 CC16EC56E for ; Tue, 29 Nov 2022 09:16:51 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id AEA524810 for ; Tue, 29 Nov 2022 09:16:21 +0100 (CET) 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) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Tue, 29 Nov 2022 09:16:18 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id F3B8D44F97 for ; Tue, 29 Nov 2022 09:16:11 +0100 (CET) From: Dominik Csapak To: pbs-devel@lists.proxmox.com Date: Tue, 29 Nov 2022 09:16:11 +0100 Message-Id: <20221129081611.591774-1-d.csapak@proxmox.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.064 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [zfs.rs] Subject: [pbs-devel] [PATCH proxmox-backup] disk: zfs: improve error logging for zfs commands 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: Tue, 29 Nov 2022 08:16:51 -0000 zfs errors might include a newline in the output (e.g. when trying to create a mirror on two differently sized disks), which trips up our task log status parser since that expectes a 'TASK {status}' on the beginning of the first line. print the error from zfs into the log and bail out with a short notice to check the task log this fixes the 'unknown error' issue in the ui when an error happnes during the zfs commands Signed-off-by: Dominik Csapak --- src/api2/node/disks/zfs.rs | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/src/api2/node/disks/zfs.rs b/src/api2/node/disks/zfs.rs index 3efc8a05..2dcd6cfd 100644 --- a/src/api2/node/disks/zfs.rs +++ b/src/api2/node/disks/zfs.rs @@ -3,7 +3,7 @@ use serde_json::{json, Value}; use proxmox_router::{Permission, Router, RpcEnvironment, RpcEnvironmentType}; use proxmox_schema::api; -use proxmox_sys::task_log; +use proxmox_sys::{task_error, task_log}; use pbs_api_types::{ DataStoreConfig, ZfsCompressionType, ZfsRaidLevel, ZpoolListItem, DATASTORE_SCHEMA, @@ -277,8 +277,13 @@ pub fn create_zpool( task_log!(worker, "# {:?}", command); - let output = proxmox_sys::command::run_command(command, None)?; - task_log!(worker, "{}", output); + match proxmox_sys::command::run_command(command, None) { + Ok(output) => task_log!(worker, "{output}"), + Err(err) => { + task_error!(worker, "{err}"); + bail!("Error during 'zpool create', see task log for more details"); + } + }; if std::path::Path::new("/lib/systemd/system/zfs-import@.service").exists() { let import_unit = format!( @@ -295,8 +300,13 @@ pub fn create_zpool( } command.args(&["relatime=on", &name]); task_log!(worker, "# {:?}", command); - let output = proxmox_sys::command::run_command(command, None)?; - task_log!(worker, "{}", output); + match proxmox_sys::command::run_command(command, None) { + Ok(output) => task_log!(worker, "{output}"), + Err(err) => { + task_error!(worker, "{err}"); + bail!("Error during 'zfs set', see task log for more details"); + } + }; if add_datastore { let lock = pbs_config::datastore::lock_config()?; -- 2.30.2