From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <pve-devel-bounces@lists.proxmox.com> Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id BAAC51FF164 for <inbox@lore.proxmox.com>; Fri, 28 Mar 2025 09:28:16 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id E2F49344E7; Fri, 28 Mar 2025 09:28:08 +0100 (CET) Message-ID: <67745237-eee8-4783-9f23-cdcf25958f91@proxmox.com> Date: Fri, 28 Mar 2025 09:28:06 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird To: Thomas Lamprecht <t.lamprecht@proxmox.com>, Proxmox VE development discussion <pve-devel@lists.proxmox.com> References: <20250327142320.247169-1-l.wagner@proxmox.com> <20250327142320.247169-2-l.wagner@proxmox.com> <79bed8e2-741b-49f9-b6cf-cb0d740fe692@proxmox.com> Content-Language: de-AT, en-US From: Lukas Wagner <l.wagner@proxmox.com> In-Reply-To: <79bed8e2-741b-49f9-b6cf-cb0d740fe692@proxmox.com> X-SPAM-LEVEL: Spam detection results: 0 AWL 0.012 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 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: Re: [pve-devel] [PATCH pve-cluster 1/1] notify: add common_template_data X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion <pve-devel.lists.proxmox.com> List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>, <mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe> List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/> List-Post: <mailto:pve-devel@lists.proxmox.com> List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help> List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>, <mailto:pve-devel-request@lists.proxmox.com?subject=subscribe> Reply-To: Proxmox VE development discussion <pve-devel@lists.proxmox.com> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" <pve-devel-bounces@lists.proxmox.com> On 2025-03-27 16:31, Thomas Lamprecht wrote: > Am 27.03.25 um 15:23 schrieb Lukas Wagner: >> This commit add the `common_template_data` sub to PVE::Notify, >> providing a convenient way to get a hash with properties that >> should be accessible from all templates, namely hostname, fqdn >> and cluster-name. >> >> Signed-off-by: Lukas Wagner <l.wagner@proxmox.com> >> --- >> src/PVE/Notify.pm | 20 ++++++++++++++++++++ >> 1 file changed, 20 insertions(+) >> >> diff --git a/src/PVE/Notify.pm b/src/PVE/Notify.pm >> index c514111..9f7a74c 100644 >> --- a/src/PVE/Notify.pm >> +++ b/src/PVE/Notify.pm >> @@ -4,6 +4,7 @@ use strict; >> use warnings; >> >> use PVE::Cluster qw(cfs_register_file cfs_read_file cfs_lock_file cfs_write_file); >> +use PVE::INotify; >> use Proxmox::RS::Notify; >> >> cfs_register_file( >> @@ -130,4 +131,23 @@ sub check_may_use_target { >> } >> } >> >> +sub common_template_data { >> + my $hostname = PVE::INotify::nodename(); >> + my $fqdn = `hostname -f` || $hostname; >> + chomp $fqdn; > > A bit odd seeing the highly efficient hostname cached from inotify used > with getting the FQDN in a rather expensive (fork+exec) way. > Not so keen on the use of backticks, albeit it would not be a huge > problem. > > I'd favor using PVE::Tools::get_fqdn which should work as well as calling > `hostname -f` but also be quite a bit cheaper due to avoiding fork+exec. > It'd be probably even fine to cache in a module-local variable, as this > is not something that changes often, but also probably not a must for now. > Yeah, fair. The `hostname -f` was pre-existing in the place where we send APT update notifications, I just moved it from there. I didn't know that there was a helper for it, good to know! I'll check it out and send a v2. We of course can cache the FQDN, but realistically speaking, this is only called once per notification being sent, thus any real-world performance impact is absolutely tiny. Thanks for the feedback! -- - Lukas _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel