matthieu/pve-network
1
0
Fork 0
forked from Mirror/pve-network
Code Pull requests Activity

frr: remove erroneous outfunc from frr-reload command

Browse source 
Prior to the upgrade to frr-pythontools 10.2.1, frr-reload.py did not
print any output to STDOUT, which masked the erroneous outfunc
provided in run_command. With 10.2.1 frr-reload.py now prints to
STDOUT, which triggers the codepath for invoking the outfunc, leading
to an error when invoking frr-reload.py. By removing the outfunc the
invocation works again.

In addition to fixing the regression introduced, we also now print the
frr-reload.py informational output to the tasklog, which can be
helpful in debugging any issues when reloading the frr configuration.

Signed-off-by: Stefan Hanreich <s.hanreich@proxmox.com>
This commit is contained in:
Stefan Hanreich 2025-04-09 00:15:12 +02:00 committed by Thomas Lamprecht
parent f49d3689d7
commit 873b1431d6
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/PVE/Network/SDN/Controllers/EvpnPlugin.pm
View file

@ -634,7 +634,7 @@ sub reload_controller {
if (-e $conf_file && -e $bin_path) {
eval {
run_command([$bin_path, '--stdout', '--reload', $conf_file], outfunc => {}, errfunc => $err);
run_command([$bin_path, '--stdout', '--reload', $conf_file], errfunc => $err);
};
if ($@) {
warn "frr reload command fail. Restarting frr.";