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 D3A74BA26C for ; Tue, 19 Mar 2024 10:37:24 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id BB0751C7A9 for ; Tue, 19 Mar 2024 10:37:24 +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 ; Tue, 19 Mar 2024 10:37:21 +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 12F4948ADB for ; Tue, 19 Mar 2024 10:37:21 +0100 (CET) Date: Tue, 19 Mar 2024 10:37:14 +0100 From: Fabian =?iso-8859-1?q?Gr=FCnbichler?= To: Proxmox VE development discussion References: <20240305150758.252669-1-m.carrara@proxmox.com> <20240305150758.252669-7-m.carrara@proxmox.com> In-Reply-To: <20240305150758.252669-7-m.carrara@proxmox.com> MIME-Version: 1.0 User-Agent: astroid/0.16.0 (https://github.com/astroidmail/astroid) Message-Id: <1710839809.dxcgevda47.astroid@yuna.none> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-SPAM-LEVEL: Spam detection results: 0 AWL 0.064 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: Re: [pve-devel] [PATCH v4 pve-storage 06/16] cephconfig: support line-continuations in 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: Tue, 19 Mar 2024 09:37:24 -0000 On March 5, 2024 4:07 pm, Max Carrara wrote: > Ceph's docs state the following [0]: >> The backslash character `\` is used as the line-continuation marker >> that combines the next line with the current one. >=20 > This commit implements the support of such line-continuations in our > parser. >=20 > The line following a line ending with a '\' has its whitespace > preserved, which matches the behaviour in Ceph's original > implementation [1]. In other words, leading and trailing whitespace is > not stripped from a continued line. it's actually a bit more complicated.. ceph only supports line continuations inside values (well, in key value lines after the key ;)), and only if they are unquoted.. >=20 > [0]: https://docs.ceph.com/en/reef/rados/configuration/ceph-conf/#changes= -introduced-in-octopus > [1]: https://git.proxmox.com/?p=3Dceph.git;a=3Dblob;f=3Dceph/src/common/C= onfUtils.cc;h=3D2f78fd02bf9e27467275752e6f3bca0c5e3946ce;hb=3Drefs/heads/ma= ster#l262 >=20 > Signed-off-by: Max Carrara > --- > Changes v2 --> v3: > * new > Changes v3 --> v4: > * none >=20 > src/PVE/CephConfig.pm | 28 ++++++++++++++++++++++++---- > 1 file changed, 24 insertions(+), 4 deletions(-) >=20 > diff --git a/src/PVE/CephConfig.pm b/src/PVE/CephConfig.pm > index 74a92eb..80f71b0 100644 > --- a/src/PVE/CephConfig.pm > +++ b/src/PVE/CephConfig.pm > @@ -19,13 +19,33 @@ sub parse_ceph_config { > return $cfg if !defined($raw); > =20 > my @lines =3D split /\n/, $raw; > + my @lines_normalized; > + > + my $re_comment_not_escaped =3D qr/(? + my $re_leading_ws =3D qr/^\s+/; > + my $re_trailing_ws =3D qr/\s+$/; > + > + while (scalar(@lines)) { > + my $line =3D shift(@lines); > + $line =3D~ s/$re_comment_not_escaped//; > + $line =3D~ s/$re_leading_ws//; > + $line =3D~ s/$re_trailing_ws//; > + next if !$line; > + > + # merge lines ending with continuation character '\' > + while ($line =3D~ s/\\$//) { > + my $next_line =3D shift(@lines); > + $next_line =3D~ s/$re_comment_not_escaped//; > + $next_line =3D~ s/$re_trailing_ws//; > + $line .=3D $next_line; > + } > + > + push(@lines_normalized, $line); > + } > =20 > my $section; > =20 > - for my $line (@lines) { > - $line =3D~ s/(? - $line =3D~ s/^\s+//; > - $line =3D~ s/\s+$//; > + for my $line (@lines_normalized) { > next if !$line; > =20 > if ($line =3D~ m/^\[(.+)\]$/) { > --=20 > 2.39.2 >=20 >=20 >=20 > _______________________________________________ > pve-devel mailing list > pve-devel@lists.proxmox.com > https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel >=20 >=20 >=20