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 AA07262F84 for ; Tue, 24 Nov 2020 15:33:26 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id A091CF07E for ; Tue, 24 Nov 2020 15:32:56 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (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 2975AF076 for ; Tue, 24 Nov 2020 15:32:56 +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 E8D6640A8F for ; Tue, 24 Nov 2020 15:32:55 +0100 (CET) From: Dominik Csapak To: pve-devel@lists.proxmox.com Date: Tue, 24 Nov 2020 15:32:55 +0100 Message-Id: <20201124143255.27479-1-d.csapak@proxmox.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.314 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust 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. [ceph.pm] Subject: [pve-devel] [PATCH manager v2] API2/Ceph: fix createpools 'add_storages' parameter 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, 24 Nov 2020 14:33:26 -0000 by deleteing it from $ceph_param we deleted it also from $param since it was only a reference fix it by extracting it beforehand Signed-off-by: Dominik Csapak --- changes from v1: * also use $add_storages in permission check/pool name check PVE/API2/Ceph.pm | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/PVE/API2/Ceph.pm b/PVE/API2/Ceph.pm index c3a3091d..0c647489 100644 --- a/PVE/API2/Ceph.pm +++ b/PVE/API2/Ceph.pm @@ -16,7 +16,7 @@ use PVE::RADOS; use PVE::RESTHandler; use PVE::RPCEnvironment; use PVE::Storage; -use PVE::Tools qw(run_command file_get_contents file_set_contents); +use PVE::Tools qw(run_command file_get_contents file_set_contents extract_param); use PVE::API2::Ceph::OSD; use PVE::API2::Ceph::FS; @@ -763,34 +763,31 @@ __PACKAGE__->register_method ({ PVE::Cluster::check_cfs_quorum(); PVE::Ceph::Tools::check_ceph_configured(); - my $pool = $param->{name}; + my $pool = extract_param($param, 'name'); + my $node = extract_param($param, 'node'); + my $add_storages = extract_param($param, 'add_storages'); + my $rpcenv = PVE::RPCEnvironment::get(); my $user = $rpcenv->get_user(); - if ($param->{add_storages}) { + if ($add_storages) { $rpcenv->check($user, '/storage', ['Datastore.Allocate']); die "pool name contains characters which are illegal for storage naming\n" if !PVE::JSONSchema::parse_storage_id($pool); } - my $ceph_param = \%$param; - for my $item ('add_storages', 'name', 'node') { - # not ceph parameters - delete $ceph_param->{$item}; - } - # pool defaults - $ceph_param->{pg_num} //= 128; - $ceph_param->{size} //= 3; - $ceph_param->{min_size} //= 2; - $ceph_param->{application} //= 'rbd'; - $ceph_param->{pg_autoscale_mode} //= 'warn'; + $param->{pg_num} //= 128; + $param->{size} //= 3; + $param->{min_size} //= 2; + $param->{application} //= 'rbd'; + $param->{pg_autoscale_mode} //= 'warn'; my $worker = sub { - PVE::Ceph::Tools::create_pool($pool, $ceph_param); + PVE::Ceph::Tools::create_pool($pool, $param); - if ($param->{add_storages}) { + if ($add_storages) { my $err; eval { $add_storage->($pool, "${pool}"); }; if ($@) { -- 2.20.1