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

zebra: fix evpn mh bond member proto reinstall (backport #16252) #16264

Merged
merged 1 commit into from
Jun 21, 2024
Merged

zebra: fix evpn mh bond member proto reinstall (backport #16252) #16264

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions zebra/interface.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1656,8 +1656,10 @@ static void interface_if_protodown(struct interface *ifp, bool protodown,
uint32_t rc_bitfield)
{
struct zebra_if *zif = ifp->info;
bool old_protodown;
bool old_protodown, reason_extern;

reason_extern = !!CHECK_FLAG(zif->protodown_rc,
ZEBRA_PROTODOWN_EXTERNAL);
/*
* Set our reason code to note it wasn't us.
* If the reason we got from the kernel is ONLY frr though, don't
Expand All @@ -1673,8 +1675,8 @@ static void interface_if_protodown(struct interface *ifp, bool protodown,
return;

if (IS_ZEBRA_DEBUG_EVPN_MH_ES || IS_ZEBRA_DEBUG_DPLANE)
zlog_debug("interface %s dplane change, protodown %s",
ifp->name, protodown ? "on" : "off");
zlog_debug("interface %s dplane change, protodown %s curr reason_extern %u",
ifp->name, protodown ? "on" : "off", reason_extern);

/* Set protodown, respectively */
COND_FLAG(zif->flags, ZIF_FLAG_PROTODOWN, protodown);
Expand All @@ -1699,6 +1701,13 @@ static void interface_if_protodown(struct interface *ifp, bool protodown,
return;
}

if (!protodown && reason_extern) {
if (IS_ZEBRA_DEBUG_EVPN_MH_ES || IS_ZEBRA_DEBUG_KERNEL)
zlog_debug("bond member %s has protodown reason external and clear the reason, skip reinstall.",
ifp->name);
return;
}

if (IS_ZEBRA_DEBUG_EVPN_MH_ES || IS_ZEBRA_DEBUG_KERNEL)
zlog_debug(
"bond mbr %s reinstate protodown %s in the dplane",
Expand Down
Loading