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 5E7CD8A50F for ; Thu, 20 Oct 2022 09:17:54 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 3D7C53B2A for ; Thu, 20 Oct 2022 09:17:54 +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 for ; Thu, 20 Oct 2022 09:17:52 +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 09ECF44A1C for ; Thu, 20 Oct 2022 09:17:52 +0200 (CEST) From: Stefan Sterz To: pve-devel@lists.proxmox.com Date: Thu, 20 Oct 2022 09:17:03 +0200 Message-Id: <20221020071704.46578-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.115 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 Subject: [pve-devel] [PATCH manager v3 1/2] api: ceph: add applications of each pool to the lspools 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: Thu, 20 Oct 2022 07:17:54 -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 it Signed-off-by: Stefan Sterz --- v3: add an api viewer entry for the applications object thanks @ alwin antreich for pointing out that pools have applications! PVE/API2/Ceph/Pools.pm | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/PVE/API2/Ceph/Pools.pm b/PVE/API2/Ceph/Pools.pm index 6c05250e..f5984c2c 100644 --- a/PVE/API2/Ceph/Pools.pm +++ b/PVE/API2/Ceph/Pools.pm @@ -125,6 +125,11 @@ __PACKAGE__->register_method ({ title => 'Autoscale Status', optional => 1, }, + applications => { + type => 'object', + title => 'Associated Applications', + optional => 1, + }, }, }, links => [ { rel => 'child', href => "{pool_name}" } ], @@ -167,6 +172,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 +198,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