-
Notifications
You must be signed in to change notification settings - Fork 696
net/frr: watchfrr service handling #4712
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: master
Are you sure you want to change the base?
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
at a first glance this looks fine, but I rather have a single wrapper script in stead of two.
@AdSchellevis This one works! EDIT: Another option instead of removal could've been to change it to something like the carp syshook: |
net/frr/src/opnsense/service/conf/actions.d/actions_quagga.conf
Outdated
Show resolved
Hide resolved
@@ -1,4 +0,0 @@ | |||
#!/bin/sh |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
it's ok to try and ditch this, but it's also hard to predict that this isn't needed anymore because it handles a startup error edge case. Functionally this shouldn't matter. If we are worried about the error being shown a || true
would do the trick, or checking if already running before starting. But only commenting here for future us. ;)
Changes:
I would try to omit the start syshook, because watchfrr is now enabled by default and should handle such a case. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
thanks
ed0e2bd
to
2bcd16d
Compare
Pushed the wrong one 😅 Note: The startup now is taken from the carp hook. This is not explicitly required, but i noticed sometimes some weird timing issues on reboot, when the service starts and watchfrr starts the all the services. It safeguards the setting of needed costs. |
Changes:
|
This commit fixes CARP event handler integration with FRR service startup.
It resolves issues with triggering the CARP event handler during service startup, particularly in setups where route costs depend on CARP status.
More information on actual startup behavior:
https://cgit.freebsd.org/ports/tree/net/frr8/files/frr.in#n15
https://cgit.freebsd.org/ports/tree/net/frr8/files/watchfrr.in#n25
Tested Scenarios (correct costs applied):
✓ Stopping / Starting FRR
✓ Killing ospfd process
✓ Reboot
✓ Service reload through frr-reload.py
Resolves #4702