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

zebra: Prevent a kernel route from being there when a connected should (backport #17088) #17124

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Oct 15, 2024

There exists a series of events where a kernel route is learned first( that happens to be exactly what a connected route should be ) and FRR ends up with both a kernel route and a connected route, leaving us in a very strange spot. This code change just mirrors the existing code of if there is a connected route drop the kernel route. Here we just do the reverse, if we have a kernel route already and a connected should be created, remove the kernel and keep the connected.


This is an automatic backport of pull request #17088 done by Mergify.

There exists a series of events where a kernel route is learned
first( that happens to be exactly what a connected route should be )
and FRR ends up with both a kernel route and a connected route,
leaving us in a very strange spot.  This code change just mirrors
the existing code of if there is a connected route drop the kernel
route.  Here we just do the reverse, if we have a kernel route
already and a connected should be created, remove the kernel and
keep the connected.

Signed-off-by: Donald Sharp <[email protected]>
(cherry picked from commit 74e2519)

# Conflicts:
#	zebra/connected.c
Copy link
Author

mergify bot commented Oct 15, 2024

Cherry-pick of 74e2519 has failed:

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

You are currently cherry-picking commit 74e25198e7.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   zebra/connected.c

no changes added to commit (use "git add" and/or "git commit -a")

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

@donaldsharp
Copy link
Member

This change should only go in dev/10.2

@ton31337 ton31337 deleted the mergify/bp/stable/9.0/pr-17088 branch October 25, 2024 10:13
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.

1 participant