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 4BA30634DA for ; Tue, 25 Jan 2022 09:51:58 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 41D0A2B2FD for ; Tue, 25 Jan 2022 09:51:58 +0100 (CET) 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 id D53372B2F3 for ; Tue, 25 Jan 2022 09:51:54 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id A77BD45F5A for ; Tue, 25 Jan 2022 09:51:54 +0100 (CET) From: Aaron Lauterer To: pve-devel@lists.proxmox.com Date: Tue, 25 Jan 2022 09:51:53 +0100 Message-Id: <20220125085153.1451323-1-a.lauterer@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220124170340.1858708-1-a.lauterer@proxmox.com> References: <20220124170340.1858708-1-a.lauterer@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.002 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] [PATCHi v3 manager] fix #3451 ui: ceph create osd: show custom device classes 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, 25 Jan 2022 08:51:58 -0000 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//ceph/osd endpoint, especially in larger clusters. Signed-off-by: Aaron Lauterer --- changes from v2: - check against eslint warnings, adding two commas changes from v1: - template string for API call - API failure now throws an alert - used Thomas idea on how to make the list creation more concise and only update the combo items if we do have custom device classes - reverted default `comboItems` to the element definition @Thomas by using `Array.from` we can iterate over the results returned from matchAll and also map element [1] from the returned array as it actually holds the matched item. The unshift needed the `...` deconstruction operator as comboItems is an array of arrays. www/manager6/ceph/OSD.js | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/www/manager6/ceph/OSD.js b/www/manager6/ceph/OSD.js index 30671dc4..9651de1b 100644 --- a/www/manager6/ceph/OSD.js +++ b/www/manager6/ceph/OSD.js @@ -17,6 +17,27 @@ Ext.define('PVE.CephCreateOsd', { me.isCreate = true; + Proxmox.Utils.API2Request({ + url: `/nodes/${me.nodename}/ceph/crush`, + method: 'GET', + failure: response => Ext.Msg.alert(gettext('Error'), response.htmlStatus), + success: function({ result: { data } }) { + let classes = [...new Set( + Array.from( + data.matchAll(/^device\s[0-9]*\sosd\.[0-9]*\sclass\s(.*)$/gim), + m => m[1], + ).filter(v => !['hdd', 'ssd', 'nvme'].includes(v)), + )].map(v => [v, v]); + + if (classes.length) { + let kvField = me.down('field[name=crush-device-class]'); + classes.unshift(...kvField.comboItems); + + kvField.setComboItems(classes); + } + }, + }); + Ext.applyIf(me, { url: "/nodes/" + me.nodename + "/ceph/osd", method: 'POST', -- 2.30.2