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 C7E78C4B2 for ; Tue, 3 May 2022 13:31:53 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id C5C6FBA0 for ; Tue, 3 May 2022 13:31:53 +0200 (CEST) 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)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 09D05B8C for ; Tue, 3 May 2022 13:31:53 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id D2D6F4310D for ; Tue, 3 May 2022 13:31:52 +0200 (CEST) From: Stoiko Ivanov To: pve-devel@lists.proxmox.com Date: Tue, 3 May 2022 13:31:39 +0200 Message-Id: <20220503113140.1680807-2-s.ivanov@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220503113140.1680807-1-s.ivanov@proxmox.com> References: <20220503113140.1680807-1-s.ivanov@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.204 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 T_SCC_BODY_TEXT_LINE -0.01 - URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [rbdplugin.pm] Subject: [pve-devel] [PATCH storage 1/2] rbd: add fallback default poolname 'rbd' to status 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: Tue, 03 May 2022 11:31:53 -0000 the fallback to a default pool name of 'rbd' was introduced in: 1440604a4b072b88cc1e4f8bbae4511b50d1d68e and worked for the status command, because it used the `rados_cmd` sub. This fallback was lost with the changes in: 41aacc6cdeea9b0c8007cbfb280acf827932c3d6 leading to confusing errors: `Use of uninitialized value in string eq at \ /usr/share/perl5/PVE/Storage/RBDPlugin.pm line 633` (e.g. in the journal from pvestatd) Signed-off-by: Stoiko Ivanov --- PVE/Storage/RBDPlugin.pm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/PVE/Storage/RBDPlugin.pm b/PVE/Storage/RBDPlugin.pm index 91a4a76..c4a69b2 100644 --- a/PVE/Storage/RBDPlugin.pm +++ b/PVE/Storage/RBDPlugin.pm @@ -630,7 +630,9 @@ sub status { my $rados = $librados_connect->($scfg, $storeid); my $df = $rados->mon_command({ prefix => 'df', format => 'json' }); - my ($d) = grep { $_->{name} eq $scfg->{pool} } @{$df->{pools}}; + my $pool = $scfg->{pool} ? $scfg->{pool} : 'rbd'; + + my ($d) = grep { $_->{name} eq $pool } @{$df->{pools}}; # max_avail -> max available space for data w/o replication in the pool # bytes_used -> data w/o replication in the pool -- 2.30.2