public inbox for pve-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: Aaron Lauterer <a.lauterer@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH manager] fix #3451 ui: ceph create osd: show custom device classes
Date: Fri, 21 Jan 2022 15:51:15 +0100	[thread overview]
Message-ID: <20220121145115.1374455-1-a.lauterer@proxmox.com> (raw)

Showing already configured custom device classes makes it easier to
create new OSDs with custom device classes.

The Crush map contains a list of all OSDs in the cluster, including
their device class.
This means we can create a list of used device classes from it, avoiding
adding another API endpoint.

Fetching the crushmap should also be quite a bit less data that needs to
be transferred, compared to the other possible nodes/<node>/ceph/osd
endpoint, especially in larger clusters.

Signed-off-by: Aaron Lauterer <a.lauterer@proxmox.com>
---
 www/manager6/ceph/OSD.js | 37 ++++++++++++++++++++++++++++++++-----
 1 file changed, 32 insertions(+), 5 deletions(-)

diff --git a/www/manager6/ceph/OSD.js b/www/manager6/ceph/OSD.js
index 30671dc4..eb27d3b3 100644
--- a/www/manager6/ceph/OSD.js
+++ b/www/manager6/ceph/OSD.js
@@ -17,6 +17,38 @@ Ext.define('PVE.CephCreateOsd', {
 
 	me.isCreate = true;
 
+	let deviceClasses = [
+	    ['hdd', 'HDD'],
+	    ['ssd', 'SSD'],
+	    ['nvme', 'NVMe'],
+	];
+
+	Proxmox.Utils.API2Request({
+	    url: "/nodes/" + me.nodename + "/ceph/crush",
+	    method: 'GET',
+	    failure: function(response, opts) {
+		let msg = response.htmlStatus;
+		console.error('Failed to load crushmap', msg);
+		// We still need to show the default list of device classes
+		me.down('field[name=crush-device-class]').setComboItems(deviceClasses);
+	    },
+	    success: function(response, opts) {
+		let data = response.result.data;
+
+		let classes = new Set();
+		for (const match of data.matchAll(/^device\s[0-9]*\sosd\.[0-9]*\sclass\s(.*)$/gim)) {
+		    classes.add(match[1]);
+		}
+		for (const v of ['hdd', 'ssd', 'nvme']) {
+		    classes.delete(v);
+		}
+		for (const v of classes) {
+		    deviceClasses.push([v, v]);
+		}
+		me.down('field[name=crush-device-class]').setComboItems(deviceClasses);
+	    },
+	});
+
         Ext.applyIf(me, {
 	    url: "/nodes/" + me.nodename + "/ceph/osd",
 	    method: 'POST',
@@ -81,11 +113,6 @@ Ext.define('PVE.CephCreateOsd', {
 			},
 			{
 			    xtype: 'proxmoxKVComboBox',
-			    comboItems: [
-				['hdd', 'HDD'],
-				['ssd', 'SSD'],
-				['nvme', 'NVMe'],
-			    ],
 			    name: 'crush-device-class',
 			    nodename: me.nodename,
 			    fieldLabel: gettext('Device Class'),
-- 
2.30.2





             reply	other threads:[~2022-01-21 14:51 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-01-21 14:51 Aaron Lauterer [this message]
2022-01-24 15:32 ` Thomas Lamprecht
2022-01-24 15:39   ` Thomas Lamprecht

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220121145115.1374455-1-a.lauterer@proxmox.com \
    --to=a.lauterer@proxmox.com \
    --cc=pve-devel@lists.proxmox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal