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 86AF6920DC for ; Fri, 16 Feb 2024 15:56:56 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 864B746AC for ; Fri, 16 Feb 2024 15:56:25 +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 ; Fri, 16 Feb 2024 15:56:24 +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 E6AF1485D8 for ; Fri, 16 Feb 2024 15:56:23 +0100 (CET) From: Max Carrara To: pve-devel@lists.proxmox.com Date: Fri, 16 Feb 2024 15:56:09 +0100 Message-Id: <20240216145615.2301594-8-m.carrara@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240216145615.2301594-1-m.carrara@proxmox.com> References: <20240216145615.2301594-1-m.carrara@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.008 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 v3 pve-storage 07/13] 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: Fri, 16 Feb 2024 14:56:56 -0000 This adds support for writing arbitrary sections to 'ceph.conf' while ensuring that already written sections are not duplicated. Sections that are associated with the client, for example '[client.foo]', are written directly after the '[client]' section. Signed-off-by: Max Carrara --- Changes v1 --> v2: * Instead of just adding 'client.crash' as a separate section, also allow writing arbitrary sections Changes v2 --> v3: * this patch now only contains the changes actually mentioned in the commit message; the other changes have been put into separate patches src/PVE/CephConfig.pm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/PVE/CephConfig.pm b/src/PVE/CephConfig.pm index 2c4a086..e78209e 100644 --- a/src/PVE/CephConfig.pm +++ b/src/PVE/CephConfig.pm @@ -79,6 +79,7 @@ my $parse_ceph_file = sub { sub write_ceph_config { my ($filename, $cfg) = @_; + my $written_sections = {}; my $out = ''; my $cond_write_sec = sub { @@ -86,16 +87,21 @@ sub write_ceph_config { foreach my $section (sort keys %$cfg) { next if $section !~ m/^$re$/; + next if exists($written_sections->{$section}); + $out .= "[$section]\n"; foreach my $key (sort keys %{$cfg->{$section}}) { $out .= "\t $key = $cfg->{$section}->{$key}\n"; } $out .= "\n"; + + $written_sections->{$section} = 1; } }; &$cond_write_sec('global'); &$cond_write_sec('client'); + &$cond_write_sec('client\..*'); &$cond_write_sec('mds'); &$cond_write_sec('mon'); @@ -107,6 +113,8 @@ sub write_ceph_config { &$cond_write_sec('osd\..*'); &$cond_write_sec('mgr\..*'); + &$cond_write_sec('.*'); + return $out; } -- 2.39.2