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 00B0C74C45 for ; Tue, 20 Apr 2021 10:15:32 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id C617F20370 for ; Tue, 20 Apr 2021 10:15:31 +0200 (CEST) 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 E20D02028D for ; Tue, 20 Apr 2021 10:15:24 +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 AF3F645B8A; Tue, 20 Apr 2021 10:15:24 +0200 (CEST) From: Dominik Csapak To: pve-devel@lists.proxmox.com Cc: Alwin Antreich Date: Tue, 20 Apr 2021 10:15:20 +0200 Message-Id: <20210420081523.2704-7-d.csapak@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210420081523.2704-1-d.csapak@proxmox.com> References: <20210420081523.2704-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.156 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.com, tools.pm] Subject: [pve-devel] [PATCH manager v4 6/9] fix: ceph: always set pool size first 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, 20 Apr 2021 08:15:32 -0000 From: Alwin Antreich Since Ceph Nautilus 14.2.10 and Octopus 15.2.2 the min_size of a pool is calculated by the size (round(size / 2)). When size is applied after min_size to the pool, the manual specified min_size will be overwritten. Signed-off-by: Alwin Antreich Signed-off-by: Dominik Csapak --- PVE/Ceph/Tools.pm | 61 +++++++++++++++++++++++++++++++---------------- 1 file changed, 40 insertions(+), 21 deletions(-) diff --git a/PVE/Ceph/Tools.pm b/PVE/Ceph/Tools.pm index ab38f7bc..9d4d595f 100644 --- a/PVE/Ceph/Tools.pm +++ b/PVE/Ceph/Tools.pm @@ -200,33 +200,52 @@ sub check_ceph_enabled { return 1; } +my $set_pool_setting = sub { + my ($pool, $setting, $value) = @_; + + my $command; + if ($setting eq 'application') { + $command = { + prefix => "osd pool application enable", + pool => "$pool", + app => "$value", + }; + } else { + $command = { + prefix => "osd pool set", + pool => "$pool", + var => "$setting", + val => "$value", + format => 'plain', + }; + } + + my $rados = PVE::RADOS->new(); + eval { $rados->mon_command($command); }; + return $@ ? $@ : undef; +}; + sub set_pool { my ($pool, $param) = @_; - foreach my $setting (keys %$param) { - my $value = $param->{$setting}; - - my $command; - if ($setting eq 'application') { - $command = { - prefix => "osd pool application enable", - pool => "$pool", - app => "$value", - }; + # by default, pool size always sets min_size, + # set it and forget it, as first item + # https://tracker.ceph.com/issues/44862 + if ($param->{size}) { + my $value = $param->{size}; + if (my $err = $set_pool_setting->($pool, 'size', $value)) { + print "$err"; } else { - $command = { - prefix => "osd pool set", - pool => "$pool", - var => "$setting", - val => "$value", - format => 'plain', - }; + delete $param->{size}; } + } + + foreach my $setting (keys %$param) { + my $value = $param->{$setting}; + next if $setting eq 'size'; - my $rados = PVE::RADOS->new(); - eval { $rados->mon_command($command); }; - if ($@) { - print "$@"; + if (my $err = $set_pool_setting->($pool, $setting, $value)) { + print "$err"; } else { delete $param->{$setting}; } -- 2.20.1