[pve-devel] [PATCH pve-network v2 05/19] frr: add new helpers for reloading frr configuration

[Gabriel Goller <g.goller@proxmox.com>]

From: Stefan Hanreich <s.hanreich@proxmox.com>

The old FRR configuration helper in the EVPN plugin defined a hash as
outfunc, which led to an error in the run_command invocation:

  Not a CODE reference at /usr/share/perl5/PVE/Tools.pm line 577.

This meant that frr-reload.py was never successfully invoked in the
first place.

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.

Due to completely omitting the outfunc, we now print the log of
frr-reload.py to STDOUT, so they are included in the task log for
debugging purposes.

Signed-off-by: Stefan Hanreich <s.hanreich@proxmox.com>
Signed-off-by: Gabriel Goller <g.goller@proxmox.com>
---
 src/PVE/Network/SDN/Frr.pm | 62 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 62 insertions(+)

diff --git a/src/PVE/Network/SDN/Frr.pm b/src/PVE/Network/SDN/Frr.pm
index 20eb4d3e405d..155cd591ea40 100644
--- a/src/PVE/Network/SDN/Frr.pm
+++ b/src/PVE/Network/SDN/Frr.pm
@@ -44,6 +44,68 @@ 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;
+    }
+
+    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