From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id AC7FE1FF183 for ; Wed, 2 Jul 2025 16:56:34 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 343491FB62; Wed, 2 Jul 2025 16:52:11 +0200 (CEST) From: Gabriel Goller To: pve-devel@lists.proxmox.com Date: Wed, 2 Jul 2025 16:50:25 +0200 Message-Id: <20250702145101.894299-41-g.goller@proxmox.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250702145101.894299-1-g.goller@proxmox.com> References: <20250702145101.894299-1-g.goller@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.014 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 Subject: [pve-devel] [PATCH pve-network v4 05/21] frr: add new helpers for reloading frr configuration 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: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" From: Stefan Hanreich The reload and restart parts of the original reload_controller_config have been split into two functions, in order to make error handling in the new apply function easier. The new apply function tries to reload via frr-reload.py and if that fails, it falls back to restarting the frr service. Since frr-reload.py does *not* start / stop daemons that have been added / remove to /etc/frr/daemons, we add a new parameter that can be used to restart the frr service instead of just using frr-reload.py. Signed-off-by: Stefan Hanreich --- src/PVE/Network/SDN/Frr.pm | 65 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) diff --git a/src/PVE/Network/SDN/Frr.pm b/src/PVE/Network/SDN/Frr.pm index 9c6e91c94967..2698928c9b03 100644 --- a/src/PVE/Network/SDN/Frr.pm +++ b/src/PVE/Network/SDN/Frr.pm @@ -44,6 +44,71 @@ sub read_local_frr_config { } } +my $FRR_CONFIG_FILE = "/etc/frr/frr.conf"; + +=head3 apply() + +Tries to reload FRR with the frr-reload.py script from frr-pythontools. If that +isn't installed or doesn't work it falls back to restarting the systemd frr +service. If C<$force_restart> is set, then the FRR daemon will be restarted, +without trying to reload it first. + +=cut + +sub apply { + my ($force_restart) = @_; + + if (!-e $FRR_CONFIG_FILE) { + log_warn("$FRR_CONFIG_FILE is not present."); + return; + } + + run_command(['systemctl', 'enable', '--now', 'frr']) + if !-e "/etc/systemd/system/multi-user.target.wants/frr.service"; + + if (!$force_restart) { + eval { reload() }; + return if !$@; + + warn "reloading frr configuration failed: $@"; + warn "trying to restart frr instead"; + } + + eval { restart() }; + warn "restarting frr failed: $@" if $@; +} + +sub reload { + my $bin_path = "/usr/lib/frr/frr-reload.py"; + + if (!-e $bin_path) { + die "missing $bin_path. Please install the frr-pythontools package"; + } + + my $err = sub { + my $line = shift; + warn "$line \n"; + }; + + run_command([$bin_path, '--stdout', '--reload', $FRR_CONFIG_FILE], errfunc => $err); +} + +sub restart { + # script invoked by the frr systemd service + my $bin_path = "/usr/lib/frr/frrinit.sh"; + + if (!-e $bin_path) { + die "missing $bin_path. Please install the frr package"; + } + + my $err = sub { + my $line = shift; + warn "$line \n"; + }; + + run_command(['systemctl', 'restart', 'frr'], errfunc => $err); +} + =head3 to_raw_config(\%frr_config) Converts a given C<\%frr_config> to the raw config format. -- 2.39.5 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel