Skip to content
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

watchfrr: Extend ignore option to daemon being killed #14618

Merged
merged 1 commit into from
Oct 19, 2023

Conversation

donaldsharp
Copy link
Member

When testing GR features, it is desired to kill bgp (or really any daemon )and not immediately have bgp start up again. Modify the code to not attempt to restart the daemon by hand to let us developers work when the watchfrr ignore XXX command is issued.

Testing:
watchfrr ignore bgpd
kill -9 bgpd
start bgp by /usr/lib/frr/watchfrr.sh start bgpd at some point in time in the future

leaf-1# show watchfrr
watchfrr global phase: Idle
Restart Command: "/usr/lib/frr/watchfrr.sh restart %s"
Start Command: "/usr/lib/frr/watchfrr.sh start %s"
Stop Command: "/usr/lib/frr/watchfrr.sh stop %s"
Min Restart Interval: 60
Max Restart Interval: 600
Restart Timeout: 90
zebra Up
bgpd Up/Ignoring Timeout
staticd Up
leaf-1#

When testing GR features, it is desired to kill bgp
(or really any daemon )and not immediately have bgp start up again.
Modify the code to not attempt to restart the daemon
by hand to let us developers work when the `watchfrr ignore XXX`
command is issued.

Testing:
watchfrr ignore bgpd
kill -9 bgpd
start bgp by `/usr/lib/frr/watchfrr.sh start bgpd` at some point in time
in the future

leaf-1# show watchfrr
watchfrr global phase: Idle
 Restart Command: "/usr/lib/frr/watchfrr.sh restart %s"
 Start Command: "/usr/lib/frr/watchfrr.sh start %s"
 Stop Command: "/usr/lib/frr/watchfrr.sh stop %s"
 Min Restart Interval: 60
 Max Restart Interval: 600
 Restart Timeout: 90
  zebra                Up
  bgpd                 Up/Ignoring Timeout
  staticd              Up
leaf-1#

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
@ton31337
Copy link
Member

@Mergifyio backport dev/9.1

@ton31337 ton31337 merged commit 2775d22 into FRRouting:master Oct 19, 2023
80 checks passed
@mergify
Copy link

mergify bot commented Oct 19, 2023

backport dev/9.1

✅ Backports have been created

donaldsharp added a commit that referenced this pull request Oct 19, 2023
watchfrr: Extend ignore option to daemon being killed (backport #14618)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants