watchfrr: don't admit to systemd that we restart

[eqvinox]

As of systemd 259 (98734ac74d16), once you're telling it that you're stopping, you're stopping, full stop. systemd will make sure of it.

So, I guess we just shouldn't admit to systemd that we're restarting.

Fixes: #20430
References: systemd/systemd@98734ac

[donaldsharp]

I guess I'm grumpy about removing this. I use the status line in systemd status frr to help me understand where we are sometimes. It's useful information that I don't want to loose.

As I understand it this is a problem in relation to reload -vs- restart. restart works fine. reload restarts watchfrr causing this problem. We are long term going to a system where watchfrr needs to be informed about what daemons it needs to know about. Why not teach it now?

[eqvinox]

As discussed on Slack, this is the correct fix at this time. We're not stopping, we can't tell systemd we're stopping. This is orthogonal to adding functionality to change the set of daemons in watchfrr really.

[donaldsharp]

Spoke w/ David. The reload operation will send a SIG_USR1 signal which will send a STATUS= Restarting due to config change instead of STOPPING=1. SIG_TERM will continue to send the STOPPING=1. The reload scripts will signal a SIG_USR1 instead of a SIG_TERM when reload is issued

[eqvinox]

Spoke w/ David. The reload operation will send a SIG_USR1 signal which will send a STATUS= Restarting due to config change instead of STOPPING=1. SIG_TERM will continue to send the STOPPING=1. The reload scripts will signal a SIG_USR1 instead of a SIG_TERM when reload is issued

done

[eqvinox]

@Mergifyio backport stable/10.7 stable/10.6 stable/10.5 stable/10.4

[mergify]

backport stable/10.7 stable/10.6 stable/10.5 stable/10.4

✅ Backports have been created

Details

• #23091 watchfrr: don't admit to systemd that we restart (backport #23088) has been created for branch stable/10.7
• #23092 watchfrr: don't admit to systemd that we restart (backport #23088) has been created for branch stable/10.6 but encountered conflicts

Cherry-pick of 34a9f14 has failed:

On branch mergify/bp/stable/10.6/pr-23088
Your branch is up to date with 'origin/stable/10.6'.

You are currently cherry-picking commit 34a9f14d6.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   tools/frrinit.sh.in
	modified:   watchfrr/watchfrr.c

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   tools/frrcommon.sh.in

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

• #23093 watchfrr: don't admit to systemd that we restart (backport #23088) has been created for branch stable/10.5 but encountered conflicts

Cherry-pick of 34a9f14 has failed:

On branch mergify/bp/stable/10.5/pr-23088
Your branch is up to date with 'origin/stable/10.5'.

You are currently cherry-picking commit 34a9f14d6.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   tools/frrinit.sh.in
	modified:   watchfrr/watchfrr.c

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   tools/frrcommon.sh.in

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

• #23094 watchfrr: don't admit to systemd that we restart (backport #23088) has been created for branch stable/10.4 but encountered conflicts

Cherry-pick of 34a9f14 has failed:

On branch mergify/bp/stable/10.4/pr-23088
Your branch is up to date with 'origin/stable/10.4'.

You are currently cherry-picking commit 34a9f14d6.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   tools/frrinit.sh.in
	modified:   watchfrr/watchfrr.c

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   tools/frrcommon.sh.in

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally