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: fix missing kernel routes (backport #17326) #17359

Closed
wants to merge 2 commits into from

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Nov 5, 2024

The rib_update_handle_kernel_route_down_possibility() didn't consider the kernel routes ( blackhole ) without interface. When some other interfaces are down, these kernel routes will be wrongly removed.


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

The `rib_update_handle_kernel_route_down_possibility()` didn't consider
the kernel routes ( blackhole )  without interface.  When some other
interfaces are down, these kernel routes will be wrongly removed.

Signed-off-by: anlan_cs <anlan_cs@126.com>
(cherry picked from commit 44a82da)

# Conflicts:
#	zebra/zebra_rib.c
The test verifies that a kernel blackhole route is not affected by
interface's link change.

Signed-off-by: anlan_cs <anlan_cs@126.com>
(cherry picked from commit 0073a87)

# Conflicts:
#	tests/topotests/zebra_multiple_connected/test_zebra_multiple_connected.py
@mergify mergify bot added the conflicts label Nov 5, 2024
Copy link
Author

mergify bot commented Nov 5, 2024

Cherry-pick of 44a82da has failed:

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

You are currently cherry-picking commit 44a82da405.
  (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/zebra_rib.c

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

Cherry-pick of 0073a87 has failed:

On branch mergify/bp/stable/10.0/pr-17326
Your branch is ahead of 'origin/stable/10.0' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 0073a870d1.
  (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:
	new file:   tests/topotests/zebra_multiple_connected/r1/ip_route_kernel_blackhole.json

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   tests/topotests/zebra_multiple_connected/test_zebra_multiple_connected.py

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

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