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 BA45090B1F for ; Mon, 12 Feb 2024 14:34:14 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 9A7D819C55 for ; Mon, 12 Feb 2024 14:33:44 +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, 12 Feb 2024 14:33:44 +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 CF11C478DE for ; Mon, 12 Feb 2024 14:33:43 +0100 (CET) Date: Mon, 12 Feb 2024 14:33:37 +0100 From: Fabian =?iso-8859-1?q?Gr=FCnbichler?= To: Proxmox VE development discussion References: <20240205175419.1271680-1-m.carrara@proxmox.com> <20240205175419.1271680-7-m.carrara@proxmox.com> In-Reply-To: <20240205175419.1271680-7-m.carrara@proxmox.com> MIME-Version: 1.0 User-Agent: astroid/0.16.0 (https://github.com/astroidmail/astroid) Message-Id: <1707742287.xvpasi82m1.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 v2 pve-storage 06/11] cephconfig: allow writing arbitrary sections 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, 12 Feb 2024 13:34:14 -0000 On February 5, 2024 6:54 pm, Max Carrara wrote: > This adds support for writing arbitrary sections to 'ceph.conf' while > ensuring that already written sections are not duplicated. >=20 > Sections that are associated with the client, for example > '[client.foo]', are written directly after the '[client]' section. >=20 > Signed-off-by: Max Carrara Reviewed-by: Fabian Gr=C3=BCnbichler would have been easier to parse if the style cleanup and actual behaviour change would have been split.. style change: > diff --git a/src/PVE/CephConfig.pm b/src/PVE/CephConfig.pm > index 6b10d46..34c3107 100644 > --- a/src/PVE/CephConfig.pm > +++ b/src/PVE/CephConfig.pm > @@ -65,10 +65,10 @@ sub write_ceph_config { > my $cond_write_sec =3D sub { > my $re =3D shift; > =20 > - foreach my $section (sort keys %$cfg) { > + for my $section (sort keys %$cfg) { > next if $section !~ m/^$re$/; > $out .=3D "[$section]\n"; > - foreach my $key (sort keys %{$cfg->{$section}}) { > + for my $key (sort keys %{$cfg->{$section}}) { > $out .=3D "\t $key =3D $cfg->{$section}->{$key}\n"; > } > $out .=3D "\n"; actual change (small nits inline!): > diff --git a/src/PVE/CephConfig.pm b/src/PVE/CephConfig.pm > index 34c3107..24bc78c 100644 > --- a/src/PVE/CephConfig.pm > +++ b/src/PVE/CephConfig.pm > @@ -60,23 +60,30 @@ my $parse_ceph_file =3D sub { > sub write_ceph_config { > my ($filename, $cfg) =3D @_; > =20 > + my $written_sections =3D {}; > my $out =3D ''; > =20 > my $cond_write_sec =3D sub { > my $re =3D shift; > =20 > for my $section (sort keys %$cfg) { > - next if $section !~ m/^$re$/; > + if ($section !~ m/^$re$/ || exists($written_sections->{$section})) = { > + next; > + } these two could be more clearly written as next if $written_sections->{section}; next if $section !~ m/$re$/; since the two checks are not related in any way, other than both having the same effect if true (skipping that section). the second line is then unchanged, and both the diff and the resulting code is easier to parse IMHO. > + > $out .=3D "[$section]\n"; > for my $key (sort keys %{$cfg->{$section}}) { > - $out .=3D "\t $key =3D $cfg->{$section}->{$key}\n"; > + $out .=3D "\t$key =3D $cfg->{$section}->{$key}\n"; this part here is not mentioned at all, and I might have missed it if I hadn't split the diffs ;) > } > $out .=3D "\n"; > + > + $written_sections->{$section} =3D 1; > } > }; > =20 > &$cond_write_sec('global'); > &$cond_write_sec('client'); > + &$cond_write_sec('client\..*'); > =20 > &$cond_write_sec('mds'); > &$cond_write_sec('mon'); > @@ -88,6 +95,8 @@ sub write_ceph_config { > &$cond_write_sec('osd\..*'); > &$cond_write_sec('mgr\..*'); > =20 > + &$cond_write_sec('.*'); > + > return $out; > }