From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <pve-devel-bounces@lists.proxmox.com> Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 6E98C1FF164 for <inbox@lore.proxmox.com>; Fri, 11 Apr 2025 17:52:49 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 4477A1DF0A; Fri, 11 Apr 2025 17:52:42 +0200 (CEST) Mime-Version: 1.0 Date: Fri, 11 Apr 2025 17:52:08 +0200 Message-Id: <D93XHK5CHVFW.1CRUWLGWJ80P0@proxmox.com> To: "Proxmox VE development discussion" <pve-devel@lists.proxmox.com> From: "Max Carrara" <m.carrara@proxmox.com> X-Mailer: aerc 0.18.2-0-ge037c095a049 References: <20250411150831.255017-1-d.kral@proxmox.com> In-Reply-To: <20250411150831.255017-1-d.kral@proxmox.com> X-SPAM-LEVEL: Spam detection results: 0 AWL 0.079 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 Subject: Re: [pve-devel] [PATCH storage 1/2] disks: get: separate error path for retrieving SMART data X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion <pve-devel.lists.proxmox.com> List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>, <mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe> List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/> List-Post: <mailto:pve-devel@lists.proxmox.com> List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help> List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>, <mailto:pve-devel-request@lists.proxmox.com?subject=subscribe> Reply-To: Proxmox VE development discussion <pve-devel@lists.proxmox.com> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" <pve-devel-bounces@lists.proxmox.com> On Fri Apr 11, 2025 at 5:08 PM CEST, Daniel Kral wrote: > Make the subroutine get_smart_data() die with the error message from > running the `smartctl` command before. This is in preparation for the > next patch, which makes that command fail in certain scenarios. > > Signed-off-by: Daniel Kral <d.kral@proxmox.com> > --- > src/PVE/Diskmanage.pm | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/src/PVE/Diskmanage.pm b/src/PVE/Diskmanage.pm > index 4272668..059d645 100644 > --- a/src/PVE/Diskmanage.pm > +++ b/src/PVE/Diskmanage.pm > @@ -150,8 +150,10 @@ sub get_smart_data { > }; > my $err = $@; > > + die "Error getting S.M.A.R.T. data: $err\n" if $err; The above is *fine* IMO, but for future reference, I'd recommend something like this if $@ is only used in one place: die "Error getting S.M.A.R.T. data: $@\n" if $@; Also, another convenient pattern I've seen (and also been using lately) is the following---useful if you need to do a bit more than just die: if (my $err = $@) { # [...] } > + > # bit 0 and 1 mark a fatal error, other bits are for disk status -> ignore (see man 8 smartctl) > - if ((defined($returncode) && ($returncode & 0b00000011)) || $err) { > + if ((defined($returncode) && ($returncode & 0b00000011))) { The inner parentheses here are redundant, now that `|| $err` is gone ;) But can IMO just be adapted in a tiny follow-up / when applying. > die "Error getting S.M.A.R.T. data: Exit code: $returncode\n"; > } > _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel