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

bgpd: release manual vpn label on instance deletion (backport #18121) #18157

Merged
merged 1 commit into from
Feb 18, 2025

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Feb 13, 2025

When a BGP instance with a manually assigned VPN label is deleted, the label is not released from the Zebra label registry. As a result, reapplying a configuration with the same manual label leads to VPN prefix export failures.

For example, with the following configuration:

router bgp 65000 vrf BLUE
address-family ipv4 unicast
label vpn export

Release zebra label registry on unconfiguration.

Fixes: d162d5f ("bgpd: fix hardset l3vpn label available in mpls pool")


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

When a BGP instance with a manually assigned VPN label is deleted, the
label is not released from the Zebra label registry. As a result,
reapplying a configuration with the same manual label leads to VPN
prefix export failures.

For example, with the following configuration:

> router bgp 65000 vrf BLUE
>  address-family ipv4 unicast
>   label vpn export <int>

Release zebra label registry on unconfiguration.

Fixes: d162d5f ("bgpd: fix hardset l3vpn label available in mpls pool")
Signed-off-by: Louis Scalbert <[email protected]>
(cherry picked from commit d636362)

# Conflicts:
#	bgpd/bgpd.c
@mergify mergify bot added the conflicts label Feb 13, 2025
Copy link
Author

mergify bot commented Feb 13, 2025

Cherry-pick of d636362 has failed:

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

You are currently cherry-picking commit d6363625c.
  (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/bgpd.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

@riw777 riw777 merged commit 1c961e2 into stable/10.0 Feb 18, 2025
13 of 16 checks passed
@Jafaral Jafaral deleted the mergify/bp/stable/10.0/pr-18121 branch February 19, 2025 16:19
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