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)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 1DDDA6BAC3 for ; Fri, 19 Feb 2021 13:46:59 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 1466018C81 for ; Fri, 19 Feb 2021 13:46:29 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 8D0F918C5E for ; Fri, 19 Feb 2021 13:46:27 +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 4BE4C4495F for ; Fri, 19 Feb 2021 13:46:27 +0100 (CET) From: Stoiko Ivanov To: pve-devel@lists.proxmox.com Date: Fri, 19 Feb 2021 13:45:42 +0100 Message-Id: <20210219124544.12593-2-s.ivanov@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210219124544.12593-1-s.ivanov@proxmox.com> References: <20210219124544.12593-1-s.ivanov@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.063 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust 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. [zfspoolplugin.pm] Subject: [pve-devel] [PATCH storage v2 1/3] zfspoolplugin: activate_storage: minor cleanup 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: , X-List-Received-Date: Fri, 19 Feb 2021 12:46:59 -0000 Signed-off-by: Stoiko Ivanov --- PVE/Storage/ZFSPoolPlugin.pm | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/PVE/Storage/ZFSPoolPlugin.pm b/PVE/Storage/ZFSPoolPlugin.pm index 105d802..be7b1b9 100644 --- a/PVE/Storage/ZFSPoolPlugin.pm +++ b/PVE/Storage/ZFSPoolPlugin.pm @@ -529,22 +529,20 @@ sub activate_storage { $pool =~ s!/.*$!!; my $pool_imported = sub { - my @param = ('-o', 'name', '-H', "$pool"); + my @param = ('-o', 'name', '-H', $pool); my $res = eval { $class->zfs_request($scfg, undef, 'zpool_list', @param) }; - if ($@) { - warn "$@\n"; - return undef; - } + warn "$@\n" if $@; + return defined($res) && $res =~ m/$pool/; }; if (!$pool_imported->()) { # import can only be done if not yet imported! - my @param = ('-d', '/dev/disk/by-id/', '-o', 'cachefile=none', "$pool"); + my @param = ('-d', '/dev/disk/by-id/', '-o', 'cachefile=none', $pool); eval { $class->zfs_request($scfg, undef, 'zpool_import', @param) }; if (my $err = $@) { # just could've raced with another import, so recheck if it is imported - die "could not activate storage '$storeid', $@\n" if !$pool_imported->(); + die "could not activate storage '$storeid', $err\n" if !$pool_imported->(); } } return 1; -- 2.20.1