From: Max Carrara <m.carrara@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH v3 pve-storage 05/13] cephconfig: align our parser more with Ceph's parser
Date: Fri, 16 Feb 2024 15:56:07 +0100 [thread overview]
Message-ID: <20240216145615.2301594-6-m.carrara@proxmox.com> (raw)
In-Reply-To: <20240216145615.2301594-1-m.carrara@proxmox.com>
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].
4. Comment literals ('#', ';') now are preserved when escaped via a
backslash '\' [3].
[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
[3]: https://git.proxmox.com/?p=ceph.git;a=blob;f=ceph/src/common/ConfUtils.cc;h=2f78fd02bf9e27467275752e6f3bca0c5e3946ce;hb=refs/heads/master#l179
Signed-off-by: Max Carrara <m.carrara@proxmox.com>
---
Changes v1 --> v2:
* new
Changes v2 --> v3:
* support comment literals (4.)
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..bbb9d39 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
next prev parent reply other threads:[~2024-02-16 14:56 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-16 14:56 [pve-devel] [PATCH v3 ceph master, ceph quincy-stable 8, pve-storage, pve-manager 00/13] Fix #4759: Configure Permissions for ceph-crash.service Max Carrara
2024-02-16 14:56 ` [pve-devel] [PATCH v3 master ceph 01/13] debian: add patch to fix ceph crash dir permissions in postinst hook Max Carrara
2024-02-16 14:56 ` [pve-devel] [PATCH v3 master ceph 02/13] patches: add patch that reorders clients used by ceph-crash Max Carrara
2024-02-16 14:56 ` [pve-devel] [PATCH v3 quincy-stable-8 ceph 03/13] debian: add patch to fix ceph crash dir permissions in postinst hook Max Carrara
2024-02-16 14:56 ` [pve-devel] [PATCH v3 quincy-stable-8 ceph 04/13] patches: add patch that reorders clients used by ceph-crash Max Carrara
2024-02-16 14:56 ` Max Carrara [this message]
2024-02-16 14:56 ` [pve-devel] [PATCH v3 pve-storage 06/13] cephconfig: support line-continuations in parser Max Carrara
2024-02-16 14:56 ` [pve-devel] [PATCH v3 pve-storage 07/13] cephconfig: allow writing arbitrary sections Max Carrara
2024-02-16 14:56 ` [pve-devel] [PATCH v3 pve-storage 08/13] cephconfig: change code style inside config writer Max Carrara
2024-02-16 14:56 ` [pve-devel] [PATCH v3 pve-storage 09/13] cephconfig: change order of written sections Max Carrara
2024-02-16 14:56 ` [pve-devel] [PATCH v3 pve-storage 10/13] cephconfig: remove leading whitespace on write to Ceph config Max Carrara
2024-02-16 14:56 ` [pve-devel] [PATCH v3 pve-manager 11/13] ceph: introduce '/etc/pve/ceph' Max Carrara
2024-02-16 14:56 ` [pve-devel] [PATCH v3 pve-manager 12/13] fix #4759: ceph: configure ceph-crash.service and its key Max Carrara
2024-02-16 14:56 ` [pve-devel] [PATCH v3 pve-manager 13/13] bin/make: gather helper scripts in separate variable Max Carrara
2024-02-21 11:55 ` [pve-devel] [PATCH v3 ceph master, ceph quincy-stable 8, pve-storage, pve-manager 00/13] Fix #4759: Configure Permissions for ceph-crash.service Friedrich Weber
2024-02-21 13:15 ` Max Carrara
2024-02-23 16:19 ` Friedrich Weber
2024-02-26 9:51 ` Max Carrara
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240216145615.2301594-6-m.carrara@proxmox.com \
--to=m.carrara@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox