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 B9697D541 for ; Wed, 30 Nov 2022 18:07:46 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 91112213A9 for ; Wed, 30 Nov 2022 18:07:46 +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 ; Wed, 30 Nov 2022 18:07:45 +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 9142244C0D for ; Wed, 30 Nov 2022 18:07:45 +0100 (CET) From: Stoiko Ivanov To: pmg-devel@lists.proxmox.com Date: Wed, 30 Nov 2022 18:07:27 +0100 Message-Id: <20221130170727.85325-1-s.ivanov@proxmox.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.162 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% 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 Subject: [pmg-devel] [PATCH pmg-api v2] backup: restore: keep directories in /etc/pmg for inotify X-BeenThere: pmg-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Mail Gateway development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Nov 2022 17:07:46 -0000 By wiping the subdirectories in /etc/pmg/, we lose the inotify watchers upon restore (/etc/pmg itself and thus most configs are currently handled by the keep_root flag to rmtree) This can lead to inconsistencies after restoring for parts relying on config in a subdirectory (e.g. /etc/pmg/pbs/pbs.conf). This patch uses File::Find (included in perl-modules-$perlver) to keep all directories an unlink everything else. This was chosen for future robustness over keeping an explicit list of directories to keep, in case a new directory gets added. quickly tested with a fifo, chardev, and socket in the directory. an alternative approach would be to simply reload pmgdaemon/pmgproxy upon config-restore, but that feels more likely to miss some (potentially future) service, expecting inotify to work. Reported-by: Fiona Ebner Signed-off-by: Stoiko Ivanov --- v1->v2: * do not track an explicit list of directories, but simply keep all (as suggested by Fiona) * use File::Find, since it's present if perl-modules is installed I did not put this in a helper by itself in pve-common, because it seems short/direct enough to not warrant it. src/PMG/Backup.pm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/PMG/Backup.pm b/src/PMG/Backup.pm index a46167c..e6994c9 100644 --- a/src/PMG/Backup.pm +++ b/src/PMG/Backup.pm @@ -4,6 +4,7 @@ use strict; use warnings; use Data::Dumper; use File::Basename; +use File::Find; use File::Path; use POSIX qw(strftime); @@ -306,8 +307,13 @@ sub pmg_restore { unlink "$dirname/config/etc/pmg/cluster.conf"; # never restore cluster config rmtree "$dirname/config/etc/pmg/master"; - # remove current config, but keep directory for INotify - rmtree("/etc/pmg", { keep_root => 1 }); + # remove current config, but keep directories for INotify + File::Find::find({ wanted => sub { + if ( ! -d $File::Find::name) { + unlink($File::Find::name) || die "removing $File::Find::name failed: $!\n"; + } + }}, '/etc/pmg'); + # copy files system("cp -a $dirname/config/etc/pmg/* /etc/pmg/") == 0 || die "unable to restore system configuration: ERROR"; -- 2.30.2