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 3F2FB77FA0 for ; Mon, 25 Oct 2021 16:01:46 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 264852402D for ; Mon, 25 Oct 2021 16:01:46 +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 id E6D6423F02 for ; Mon, 25 Oct 2021 16:01:41 +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 904D445F88 for ; Mon, 25 Oct 2021 16:01:41 +0200 (CEST) From: Dominik Csapak To: pve-devel@lists.proxmox.com Date: Mon, 25 Oct 2021 16:01:37 +0200 Message-Id: <20211025140139.2015470-12-d.csapak@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211025140139.2015470-1-d.csapak@proxmox.com> References: <20211025140139.2015470-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.275 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 10/11] ui: ceph/fs: allow creating multiple cephfs 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: Mon, 25 Oct 2021 14:01:46 -0000 but only if there are any standby mds Signed-off-by: Dominik Csapak --- www/manager6/ceph/FS.js | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/www/manager6/ceph/FS.js b/www/manager6/ceph/FS.js index c620ec6e..1af5e6cc 100644 --- a/www/manager6/ceph/FS.js +++ b/www/manager6/ceph/FS.js @@ -86,12 +86,11 @@ Ext.define('PVE.NodeCephFSPanel', { viewModel: { parent: null, data: { - cephfsConfigured: false, mdsCount: 0, }, formulas: { canCreateFS: function(get) { - return !get('cephfsConfigured') && get('mdsCount') > 0; + return get('mdsCount') > 0; }, }, }, @@ -125,7 +124,6 @@ Ext.define('PVE.NodeCephFSPanel', { })); // manages the "install ceph?" overlay PVE.Utils.monitor_ceph_installed(view, view.rstore, view.nodename, true); - view.rstore.on('load', this.onLoad, this); view.on('destroy', () => view.rstore.stopUpdate()); }, @@ -140,15 +138,6 @@ Ext.define('PVE.NodeCephFSPanel', { }, }); }, - - onLoad: function(store, records, success) { - var vm = this.getViewModel(); - if (!(success && records && records.length > 0)) { - vm.set('cephfsConfigured', false); - return; - } - vm.set('cephfsConfigured', true); - }, }, tbar: [ { @@ -156,7 +145,6 @@ Ext.define('PVE.NodeCephFSPanel', { reference: 'createButton', handler: 'onCreate', bind: { - // only one CephFS per Ceph cluster makes sense for now disabled: '{!canCreateFS}', }, }, @@ -193,7 +181,13 @@ Ext.define('PVE.NodeCephFSPanel', { vm.set('mdsCount', 0); return; } - vm.set('mdsCount', records.length); + let count = 0; + for (const mds of records) { + if (mds.data.state === 'up:standby') { + count++; + } + } + vm.set('mdsCount', count); }, cbind: { nodename: '{nodename}', -- 2.30.2