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 653518A41F for ; Wed, 19 Oct 2022 14:17:41 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 482723431F for ; Wed, 19 Oct 2022 14:17:11 +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) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Wed, 19 Oct 2022 14:17:09 +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 68BBA449BE for ; Wed, 19 Oct 2022 14:17:09 +0200 (CEST) From: Stefan Sterz To: pve-devel@lists.proxmox.com Date: Wed, 19 Oct 2022 14:16:43 +0200 Message-Id: <20221019121644.362690-1-s.sterz@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.118 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. [pools.pm] Subject: [pve-devel] [PATCH manager v2 1/2] api: ceph: add applications of each pool to the lspool endpoint 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, 19 Oct 2022 12:17:41 -0000 since ceph luminous (ceph 12) pools need to be associated with at least one applicaton expose this information here too so that clients of this endpoint can use that information Signed-off-by: Stefan Sterz --- even though an application needs to be defined for a pool since luminous, i tried to make this code fail gracefully in the case the rados mon command fails or there is no application for a given pool. thanks @ alwin antreich for pointing out that pools have applications! PVE/API2/Ceph/Pools.pm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/PVE/API2/Ceph/Pools.pm b/PVE/API2/Ceph/Pools.pm index 6c05250e..607b6c17 100644 --- a/PVE/API2/Ceph/Pools.pm +++ b/PVE/API2/Ceph/Pools.pm @@ -167,6 +167,8 @@ __PACKAGE__->register_method ({ # pg_autoscaler module is not enabled in Nautilus my $autoscale = eval { $get_autoscale_status->($rados) }; + my $apps = eval { $rados->mon_command({ prefix => 'osd pool application get' }) }; + foreach my $e (@{$res->{pools}}) { my $d = {}; foreach my $attr (@$attr_list) { @@ -191,6 +193,10 @@ __PACKAGE__->register_method ({ $d->{percent_used} = $s->{percent_used}; } + if ($apps) { + $d->{applications} = $apps->{$d->{pool_name}} if $apps->{$d->{pool_name}}; + } + # Cephs numerical pool types are barely documented. Found the following in the Ceph # codebase: https://github.com/ceph/ceph/blob/ff144995a849407c258bcb763daa3e03cfce5059/src/osd/osd_types.h#L1221-L1233 if ($e->{type} == 1) { -- 2.30.2