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 8096F8A3B2 for ; Wed, 19 Oct 2022 14:17:12 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 61EA634328 for ; Wed, 19 Oct 2022 14:17:12 +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 ; Wed, 19 Oct 2022 14:17:11 +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 9F524449BE for ; Wed, 19 Oct 2022 14:17:11 +0200 (CEST) From: Stefan Sterz To: pve-devel@lists.proxmox.com Date: Wed, 19 Oct 2022 14:16:44 +0200 Message-Id: <20221019121644.362690-2-s.sterz@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221019121644.362690-1-s.sterz@proxmox.com> References: <20221019121644.362690-1-s.sterz@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.117 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 v2 2/2] ui: remove ceph-mgr pools from rbd pool selection 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:12 -0000 when using a hyper-converged cluster it was previously possible to add the pool used by the ceph-mgr modules (".mgr" since quincy or "device_health_metrics" previously) as an RBD storage. this would lead to all kinds of errors when that storage was used (e.g.: VMs missing their disks after a migration). hence, filter these pools from the list of available pools. Signed-off-by: Stefan Sterz --- similar to the previous api change this tries to fail gracefully if no applications are defined for a pool. www/manager6/form/CephPoolSelector.js | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/www/manager6/form/CephPoolSelector.js b/www/manager6/form/CephPoolSelector.js index 5b96398d..4dd77269 100644 --- a/www/manager6/form/CephPoolSelector.js +++ b/www/manager6/form/CephPoolSelector.js @@ -15,9 +15,17 @@ Ext.define('PVE.form.CephPoolSelector', { throw "no nodename given"; } + let filterCephMgrPools = (item) => { + let apps = item.data?.applications; + return apps === undefined || apps?.rbd !== undefined; + }; + var store = Ext.create('Ext.data.Store', { fields: ['name'], sorters: 'name', + filters: [ + filterCephMgrPools, + ], proxy: { type: 'proxmox', url: '/api2/json/nodes/' + me.nodename + '/ceph/pools', @@ -32,8 +40,10 @@ Ext.define('PVE.form.CephPoolSelector', { store.load({ callback: function(rec, op, success) { - if (success && rec.length > 0) { - me.select(rec[0]); + let filteredRec = rec.filter(filterCephMgrPools); + + if (success && filteredRec.length > 0) { + me.select(filteredRec[0]); } }, }); -- 2.30.2