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

bgpd: Clear stale routes with multiple paths (backport #17376) #17382

Closed
wants to merge 4 commits into from
Closed

bgpd: Clear stale routes with multiple paths (backport #17376) #17382

wants to merge 4 commits into from

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Nov 7, 2024

Closes #17372

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

@ton31337 @mergify
bgpd: Clear all paths including addpath once GR expires
ba4b4ea 
We iterated over all bgp_path_info's, but once we remove the path, we didn't
check for other paths under the same bgp_dest.

Signed-off-by: Donatas Abraitis <[email protected]>
(cherry picked from commit 7de464b)
@ton31337 @mergify
bgpd: Set LLGR stale routes for all the paths including addpath
abb493a 
Without this patch we set only the first path for the route (if multiple exist)
as LLGR stale and stop doing that for the rest of the paths, which is wrong.

Fixes: 1479ed2 ("bgpd: Implement LLGR helper mode")

Signed-off-by: Donatas Abraitis <[email protected]>
(cherry picked from commit 895d586)

# Conflicts:
#	bgpd/bgp_fsm.c
@ton31337 @mergify
tests: Check if routes with addpath are cleared if they are stale
d29d45a 
Signed-off-by: Donatas Abraitis <[email protected]>
(cherry picked from commit 444bdc4)
@ton31337 @mergify
tests: Check if stale routes with addpath are marked with LLGR community
7ffa04e 
Signed-off-by: Donatas Abraitis <[email protected]>
(cherry picked from commit 2e5e3b4)
@mergify Mergify
Copy link
Author

mergify bot commented Nov 7, 2024

Cherry-pick of 895d586 has failed:

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

You are currently cherry-picking commit 895d586a5f.
  (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:   bgpd/bgp_fsm.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

@mergify mergify bot added the conflicts label Nov 7, 2024
@mergify mergify bot mentioned this pull request Nov 7, 2024
Merged
@frrbot frrbot bot added bgp bugfix tests Topotests, make check, etc labels Nov 7, 2024
@donaldsharp
Copy link
Member

failed to backport to 9.0 closing

@donaldsharp donaldsharp closed this Nov 7, 2024
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
bgp bugfix size/L stable/9.0 tests Topotests, make check, etc
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@donaldsharp @ton31337