From: Stoiko Ivanov <s.ivanov@proxmox.com>
To: pmg-devel@lists.proxmox.com
Subject: [pmg-devel] [PATCH pmg-api v2] backup: restore: keep directories in /etc/pmg for inotify
Date: Wed, 30 Nov 2022 18:07:27 +0100 [thread overview]
Message-ID: <20221130170727.85325-1-s.ivanov@proxmox.com> (raw)
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 <f.ebner@proxmox.com>
Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
---
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
next reply other threads:[~2022-11-30 17:07 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-30 17:07 Stoiko Ivanov [this message]
2022-12-05 9:51 ` Fiona Ebner
2022-12-12 12:18 ` [pmg-devel] applied: " Thomas Lamprecht
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=20221130170727.85325-1-s.ivanov@proxmox.com \
--to=s.ivanov@proxmox.com \
--cc=pmg-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