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 1FB4DB4E1 for ; Fri, 29 Apr 2022 11:29:31 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 1B2039448 for ; Fri, 29 Apr 2022 11:29:01 +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 588E0943D for ; Fri, 29 Apr 2022 11:29:00 +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 2F58842F19 for ; Fri, 29 Apr 2022 11:29:00 +0200 (CEST) From: Aaron Lauterer To: pve-devel@lists.proxmox.com Date: Fri, 29 Apr 2022 11:28:59 +0200 Message-Id: <20220429092859.1044258-2-a.lauterer@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220429092859.1044258-1-a.lauterer@proxmox.com> References: <20220429092859.1044258-1-a.lauterer@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.004 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/2] api: ceph ec pools: make add_storages overridable default 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, 29 Apr 2022 09:29:31 -0000 The behavior of always adding the storage config was lost in commit e039e85. But it is more sensible to make it a default that can be changed if needed. Signed-off-by: Aaron Lauterer --- Moved the ec checks further up so we can then check storage permissions if needed PVE/API2/Ceph/Pools.pm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/PVE/API2/Ceph/Pools.pm b/PVE/API2/Ceph/Pools.pm index 4e28453c..adc2de1d 100644 --- a/PVE/API2/Ceph/Pools.pm +++ b/PVE/API2/Ceph/Pools.pm @@ -381,10 +381,10 @@ __PACKAGE__->register_method ({ properties => { node => get_standard_option('pve-node'), add_storages => { - description => "Configure VM and CT storage using the new pool. ". - "Always enabled for erasure coded pools.", + description => "Configure VM and CT storage using the new pool.", type => 'boolean', optional => 1, + default => "0; for erasure coded pools: 1", }, 'erasure-coding' => { description => "Create an erasure coded pool for RBD with an ". @@ -409,6 +409,10 @@ __PACKAGE__->register_method ({ my $rpcenv = PVE::RPCEnvironment::get(); my $user = $rpcenv->get_user(); + my $rados = PVE::RADOS->new(); + + my $ec = ec_parse_and_check(extract_param($param, 'erasure-coding'), $rados); + $add_storages = 1 if $ec && !defined $add_storages; # Ceph uses target_size_bytes if (defined($param->{'target_size'})) { @@ -429,10 +433,6 @@ __PACKAGE__->register_method ({ $param->{application} //= 'rbd'; $param->{pg_autoscale_mode} //= 'warn'; - my $rados = PVE::RADOS->new(); - - my $ec = ec_parse_and_check(extract_param($param, 'erasure-coding'), $rados); - my $worker = sub { # reopen with longer timeout $rados = PVE::RADOS->new(timeout => PVE::Ceph::Tools::get_config('long_rados_timeout')); -- 2.30.2