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 5C533EB63 for ; Mon, 12 Dec 2022 13:18:43 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 2E26648C4 for ; Mon, 12 Dec 2022 13:18:13 +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 Dec 2022 13:18:12 +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 5CD8844AA0 for ; Mon, 12 Dec 2022 13:18:12 +0100 (CET) Message-ID: <718c3996-85c5-2f54-bcd2-af479d71241c@proxmox.com> Date: Mon, 12 Dec 2022 13:18:11 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:108.0) Gecko/20100101 Thunderbird/108.0 Content-Language: en-GB To: Stoiko Ivanov , pmg-devel@lists.proxmox.com References: <20221130170727.85325-1-s.ivanov@proxmox.com> From: Thomas Lamprecht In-Reply-To: <20221130170727.85325-1-s.ivanov@proxmox.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.029 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] applied: [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: Mon, 12 Dec 2022 12:18:43 -0000 Am 30/11/2022 um 18:07 schrieb Stoiko Ivanov: > 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(-) > > applied, with Fiona's T-b, thanks! I changed the find call to directly pass the code ref sub, as I found using the "wanted" option not really helpful (name makes it sound like it would have some influence on descending, but it really is just a dumb callback). Also caught ENOENT error explicitly from the unlink invocation, while not _that_ likely IMO still a good practice.