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 5087993707 for ; Mon, 5 Feb 2024 18:55:02 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 923221B451 for ; Mon, 5 Feb 2024 18:54: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)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Mon, 5 Feb 2024 18:54: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 CC29C44481 for ; Mon, 5 Feb 2024 18:54:31 +0100 (CET) From: Max Carrara To: pve-devel@lists.proxmox.com Date: Mon, 5 Feb 2024 18:54:13 +0100 Message-Id: <20240205175419.1271680-6-m.carrara@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240205175419.1271680-1-m.carrara@proxmox.com> References: <20240205175419.1271680-1-m.carrara@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.029 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy 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 T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pve-devel] [PATCH v2 pve-storage 05/11] cephconfig: align our parser more with Ceph's parser 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: Mon, 05 Feb 2024 17:55:02 -0000 1. Comments, irrespective of whether they start with '#' or ';' are now treated the same. Otherwise, sections and key-value pairs with a trailing comment starting with ';' are still parsed. Consider this example: [some.section] # inline comment after section foo = bar ; inline comment after value The '[some.section]' section in the example above would otherwise not be parsed at all, while in the key-value definition 'foo' parses as the key, which is correct, but 'bar ; inline comment after value' parses as value, which is incorrect according to Ceph's grammar [0][1]. 2. Sections may now contain any character, including whitespace, but not '\n' or a comment literal '#' or ';'. The case for comment literals is handled in 1. above. 3. Instead of treating '-', '_' and ' ' as the same, only '_' and ' ' are treated the same, like in Ceph's parser [2]. [0]: https://git.proxmox.com/?p=ceph.git;a=blob;f=ceph/src/common/ConfUtils.cc;h=2f78fd02bf9e27467275752e6f3bca0c5e3946ce;hb=refs/heads/master#l178 [1]: https://git.proxmox.com/?p=ceph.git;a=blob;f=ceph/src/common/ConfUtils.cc;h=2f78fd02bf9e27467275752e6f3bca0c5e3946ce;hb=refs/heads/master#l194 [2]: https://git.proxmox.com/?p=ceph.git;a=blob;f=ceph/src/common/ConfUtils.cc;h=2f78fd02bf9e27467275752e6f3bca0c5e3946ce;hb=refs/heads/master#l294 Signed-off-by: Max Carrara --- Changes v1 --> v2: * new src/PVE/CephConfig.pm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/PVE/CephConfig.pm b/src/PVE/CephConfig.pm index 6b10d46..77b745f 100644 --- a/src/PVE/CephConfig.pm +++ b/src/PVE/CephConfig.pm @@ -10,6 +10,8 @@ cfs_register_file('ceph.conf', \&parse_ceph_config, \&write_ceph_config); +# For more details on how Ceph's config parser works, see: +# https://git.proxmox.com/?p=ceph.git;a=blob;f=ceph/src/common/ConfUtils.cc;h=2f78fd02bf9e27467275752e6f3bca0c5e3946ce;hb=refs/heads/master sub parse_ceph_config { my ($filename, $raw) = @_; @@ -20,14 +22,13 @@ sub parse_ceph_config { my $section; - foreach my $line (@lines) { - $line =~ s/#.*$//; + for my $line (@lines) { + $line =~ s/(#|;).*$//; $line =~ s/^\s+//; - $line =~ s/^;.*$//; $line =~ s/\s+$//; next if !$line; - $section = $1 if $line =~ m/^\[(\S+)\]$/; + $section = $1 if $line =~ m/^\[(.+)\]$/; if (!$section) { warn "no section - skip: $line\n"; next; @@ -35,11 +36,10 @@ sub parse_ceph_config { if ($line =~ m/^(.*?\S)\s*=\s*(\S.*)$/) { my ($key, $val) = ($1, $2); - # ceph treats ' ', '_' and '-' in keys the same, so lets do too - $key =~ s/[-\ ]/_/g; + # ceph treats ' ' and '_' in keys the same, so lets do too + $key =~ s/ /_/g; $cfg->{$section}->{$key} = $val; } - } return $cfg; -- 2.39.2