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 A2933751C2 for ; Fri, 4 Jun 2021 15:50:08 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 481EC1E0BA for ; Fri, 4 Jun 2021 15:50:06 +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 082D31DDA8 for ; Fri, 4 Jun 2021 15:49:52 +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 D5A5046723 for ; Fri, 4 Jun 2021 15:49:51 +0200 (CEST) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Fri, 4 Jun 2021 15:49:45 +0200 Message-Id: <20210604134946.152720-22-f.ebner@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210604134946.152720-1-f.ebner@proxmox.com> References: <20210604134946.152720-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.001 Adjusted score from AWL reputation of From: address 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [osd.pm] Subject: [pve-devel] [PATCH manager 11/12] api: ceph: osd: create: rename size parameters 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, 04 Jun 2021 13:50:08 -0000 Signed-off-by: Fabian Ebner --- PVE/API2/Ceph/OSD.pm | 8 ++------ www/manager6/ceph/OSD.js | 8 ++++---- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/PVE/API2/Ceph/OSD.pm b/PVE/API2/Ceph/OSD.pm index 27e0642c..79548b2f 100644 --- a/PVE/API2/Ceph/OSD.pm +++ b/PVE/API2/Ceph/OSD.pm @@ -223,7 +223,7 @@ __PACKAGE__->register_method ({ optional => 1, type => 'string', }, - db_size => { + db_dev_size => { description => "Size in GiB for block.db.", verbose_description => "If a block.db is requested but the size is not given, ". "will be automatically selected by: bluestore_block_db_size from the ". @@ -241,7 +241,7 @@ __PACKAGE__->register_method ({ optional => 1, type => 'string', }, - wal_size => { + wal_dev_size => { description => "Size in GiB for block.wal.", verbose_description => "If a block.wal is requested but the size is not given, ". "will be automatically selected by: bluestore_block_wal_size from the ". @@ -300,10 +300,6 @@ __PACKAGE__->register_method ({ } } - # FIXME: rename params on next API compatibillity change (7.0) - $param->{wal_dev_size} = delete $param->{wal_size}; - $param->{db_dev_size} = delete $param->{db_size}; - for my $type ( qw(dev db_dev wal_dev) ) { next if !$param->{$type}; diff --git a/www/manager6/ceph/OSD.js b/www/manager6/ceph/OSD.js index 13cd2fc5..aea38d6c 100644 --- a/www/manager6/ceph/OSD.js +++ b/www/manager6/ceph/OSD.js @@ -55,13 +55,13 @@ Ext.define('PVE.CephCreateOsd', { emptyText: 'use OSD disk', listeners: { change: function(field, val) { - me.down('field[name=db_size]').setDisabled(!val); + me.down('field[name=db_dev_size]').setDisabled(!val); }, }, }, { xtype: 'numberfield', - name: 'db_size', + name: 'db_dev_size', fieldLabel: gettext('DB size') + ' (GiB)', minValue: 1, maxValue: 128*1024, @@ -108,13 +108,13 @@ Ext.define('PVE.CephCreateOsd', { emptyText: 'use OSD/DB disk', listeners: { change: function(field, val) { - me.down('field[name=wal_size]').setDisabled(!val); + me.down('field[name=wal_dev_size]').setDisabled(!val); }, }, }, { xtype: 'numberfield', - name: 'wal_size', + name: 'wal_dev_size', fieldLabel: gettext('WAL size') + ' (GiB)', minValue: 0.5, maxValue: 128*1024, -- 2.30.2