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.

Sign up for GitHub

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

Jump to bottom

Mrib nht wonky (backport #17254) #17279

Closed
wants to merge 3 commits into from
Closed

Mrib nht wonky (backport #17254) #17279

wants to merge 3 commits into from

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Oct 28, 2024

This is an automatic backport of pull request #17254 done by [Mergify](https://mergify.com).

@donaldsharp @mergify
sharpd: Allow sharpd to watch nexthops in the mrib
dff3934 
Nothing special here, just allow sharpd to ask to watch
nexthops in the mrib.

Signed-off-by: Donald Sharp <[email protected]>
(cherry picked from commit aff8eaa)
@donaldsharp @mergify
zebra: Add safi to some debugs
1a1dcb6 
Trying to figure out what safi we are talking about is fun when
it is not put into the debugs.

Signed-off-by: Donald Sharp <[email protected]>
(cherry picked from commit 811168e)
@donaldsharp @mergify
zebra: When installing a mroute, allow it to flow
709760b 
Currently the mroute code was not allowing the mroute
to be sent to the dataplane.  This leaves us with a
situation where the routes being installed where never
being set as installed and additionally nht against
the mrib would not work if the route came into existence
after the nexthop tracking was asked for.

Turns out all the pieces where there to let this work.
Modify the code to pass it to the dplane and to send
it back up as having worked.

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

# Conflicts:
#	zebra/zebra_rib.c
@mergify mergify bot added the conflicts label Oct 28, 2024
@mergify Mergify
Copy link
Author

mergify bot commented Oct 28, 2024

Cherry-pick of 3bff65a has failed:

On branch mergify/bp/dev/10.2/pr-17254
Your branch is ahead of 'origin/dev/10.2' by 2 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 3bff65abc7.
  (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:   zebra/dplane_fpm_nl.c
	modified:   zebra/rt_netlink.c
	modified:   zebra/rt_socket.c

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

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

@mergify mergify bot mentioned this pull request Oct 28, 2024
Merged
@donaldsharp donaldsharp mentioned this pull request Oct 30, 2024
Merged
@donaldsharp
Copy link
Member

Created a manual PR #17309 to take care of this issue closing

@Jafaral Jafaral deleted the mergify/bp/dev/10.2/pr-17254 branch March 10, 2025 03:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
dev/10.2 sharp size/L zebra
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@donaldsharp