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 7D5D671503 for ; Wed, 18 May 2022 11:04:55 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 7421F245C for ; Wed, 18 May 2022 11:04:55 +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 F0818244E for ; Wed, 18 May 2022 11:04:54 +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 C5C1F436AA for ; Wed, 18 May 2022 11:04:54 +0200 (CEST) From: Aaron Lauterer To: pve-devel@lists.proxmox.com Date: Wed, 18 May 2022 11:04:54 +0200 Message-Id: <20220518090454.2431000-1-a.lauterer@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.006 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 v2 storage] rbd: fix #4060 show data-pool usage when configured 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: Wed, 18 May 2022 09:04:55 -0000 When a data-pool is configured, use it for status infos. The 'data-pool' config option is used to mark the erasure coded pool while the 'pool' will be the replicated pool holding meta data such as the omap. This means, the 'pool' will only use a small amount of space and people are interested how much they can store in the erasure coded pool anyway. Therefore this patch reorders the assignment of the used pool name by availability of the scfg parameters: data-pool -> pool -> fallback 'rbd' Signed-off-by: Aaron Lauterer --- changes: instead of two lines and if conditions, use the // parameter multiple times PVE/Storage/RBDPlugin.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PVE/Storage/RBDPlugin.pm b/PVE/Storage/RBDPlugin.pm index fb48c3f..3511914 100644 --- a/PVE/Storage/RBDPlugin.pm +++ b/PVE/Storage/RBDPlugin.pm @@ -630,7 +630,7 @@ sub status { my $rados = $librados_connect->($scfg, $storeid); my $df = $rados->mon_command({ prefix => 'df', format => 'json' }); - my $pool = $scfg->{pool} ? $scfg->{pool} : 'rbd'; + my $pool = $scfg->{'data-pool'} // $scfg->{pool} // 'rbd'; my ($d) = grep { $_->{name} eq $pool } @{$df->{pools}}; -- 2.30.2