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 C0F37948FF for ; Fri, 13 Jan 2023 16:10:03 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id A48F97161 for ; Fri, 13 Jan 2023 16:09:33 +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 for ; Fri, 13 Jan 2023 16:09:32 +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 AD51545290 for ; Fri, 13 Jan 2023 16:09:31 +0100 (CET) From: Aaron Lauterer To: pve-devel@lists.proxmox.com Date: Fri, 13 Jan 2023 16:09:29 +0100 Message-Id: <20230113150930.857270-3-a.lauterer@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230113150930.857270-1-a.lauterer@proxmox.com> References: <20230113150930.857270-1-a.lauterer@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.041 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 2/3] fix #2515: ui: ceph pool create: use configured defaults for size and min_size 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: Fri, 13 Jan 2023 15:10:03 -0000 Instead of hard coded defaults for the size and min_size parameter, check if we have defaults configured in the ceph.conf or config db and use those. There are clusters where different defaults are needed. For example if the cluster spans two rooms and needs to survive the loss of one. A size/min_size of 4/2 are common defaults in such a situation. Signed-off-by: Aaron Lauterer --- www/manager6/ceph/Pool.js | 57 ++++++++++++++++++++++++++++++--------- 1 file changed, 45 insertions(+), 12 deletions(-) diff --git a/www/manager6/ceph/Pool.js b/www/manager6/ceph/Pool.js index a1f008d1..86f83ffb 100644 --- a/www/manager6/ceph/Pool.js +++ b/www/manager6/ceph/Pool.js @@ -27,7 +27,9 @@ Ext.define('PVE.CephPoolInputPanel', { name: 'size', editConfig: { xtype: 'proxmoxintegerfield', - value: 3, + cbind: { + value: (get) => get('defaultSize') ?? 3, + }, minValue: 2, maxValue: 7, allowBlank: false, @@ -40,7 +42,6 @@ Ext.define('PVE.CephPoolInputPanel', { }, }, }, - }, ], column2: [ @@ -78,9 +79,15 @@ Ext.define('PVE.CephPoolInputPanel', { xtype: 'proxmoxintegerfield', fieldLabel: gettext('Min. Size'), name: 'min_size', - value: 2, cbind: { - minValue: (get) => get('isCreate') ? 2 : 1, + value: (get) => get('defaultMinSize') ?? 2, + minValue: (get) => { + if (Number(get('defaultMinSize')) === 1) { + return 1; + } else { + return get('isCreate') ? 2 : 1; + } + }, }, maxValue: 7, allowBlank: false, @@ -216,6 +223,8 @@ Ext.define('PVE.Ceph.PoolEdit', { pool_name: '{pool_name}', isErasure: '{isErasure}', isCreate: '{isCreate}', + defaultSize: '{defaultSize}', + defaultMinSize: '{defaultMinSize}', }, }], }); @@ -372,6 +381,8 @@ Ext.define('PVE.node.Ceph.PoolList', { Ext.create('PVE.Ceph.PoolEdit', { title: gettext('Edit') + ': Ceph Pool', nodename: nodename, + defaultSize: undefined, + defaultMinSize: undefined, pool_name: rec.data.pool_name, isErasure: rec.data.type === 'erasure', autoShow: true, @@ -388,14 +399,36 @@ Ext.define('PVE.node.Ceph.PoolList', { { text: gettext('Create'), handler: function() { - Ext.create('PVE.Ceph.PoolEdit', { - title: gettext('Create') + ': Ceph Pool', - isCreate: true, - isErasure: false, - nodename: nodename, - autoShow: true, - listeners: { - destroy: () => rstore.load(), + let keys = [ + 'global:osd-pool-default-min-size', + 'global:osd-pool-default-size', + ]; + let params = { + 'config_keys': keys.join(';'), + }; + + Proxmox.Utils.API2Request({ + url: '/nodes/localhost/ceph/configkey', + method: 'GET', + params, + failure: response => Ext.Msg.alert(gettext('Error'), response.htmlStatus), + success: function({ result: { data } }) { + let global = data.global; + let defaultSize = global.osd_pool_default_size; + let defaultMinSize = global.osd_pool_default_min_size; + + Ext.create('PVE.Ceph.PoolEdit', { + title: gettext('Create') + ': Ceph Pool', + isCreate: true, + isErasure: false, + defaultSize, + defaultMinSize, + nodename: nodename, + autoShow: true, + listeners: { + destroy: () => rstore.load(), + }, + }); }, }); }, -- 2.30.2