Skip to content

Commit

Permalink
[Workaround] EvpnRemoteVnip2pOrch warmboot check failure (sonic-net#2626
Browse files Browse the repository at this point in the history
)

* fix p2p vxlan warmboot check failure
  • Loading branch information
jcaiMR authored Feb 13, 2023
1 parent 4df5cab commit 0704f78
Showing 1 changed file with 10 additions and 9 deletions.
19 changes: 10 additions & 9 deletions orchagent/vxlanorch.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2347,6 +2347,15 @@ bool EvpnRemoteVnip2pOrch::addOperation(const Request& request)
return true;
}

EvpnNvoOrch* evpn_orch = gDirectory.get<EvpnNvoOrch*>();
auto vtep_ptr = evpn_orch->getEVPNVtep();
if (!vtep_ptr)
{
SWSS_LOG_WARN("Remote VNI add: Source VTEP not found. remote=%s vid=%d",
remote_vtep.c_str(), vlan_id);
return true;
}

VxlanTunnelOrch* tunnel_orch = gDirectory.get<VxlanTunnelOrch*>();
Port tunnelPort, vlanPort;
VxlanTunnelMapOrch* vxlan_tun_map_orch = gDirectory.get<VxlanTunnelMapOrch*>();
Expand All @@ -2373,16 +2382,8 @@ bool EvpnRemoteVnip2pOrch::addOperation(const Request& request)

if (gPortsOrch->isVlanMember(vlanPort, tunnelPort))
{
EvpnNvoOrch* evpn_orch = gDirectory.get<EvpnNvoOrch*>();
auto vtep_ptr = evpn_orch->getEVPNVtep();
if (!vtep_ptr)
{
SWSS_LOG_WARN("Remote VNI add: VTEP not found. remote=%s vid=%d",
remote_vtep.c_str(),vlan_id);
return true;
}
SWSS_LOG_WARN("tunnelPort %s already member of vid %d",
remote_vtep.c_str(),vlan_id);
remote_vtep.c_str(),vlan_id);
vtep_ptr->increment_spurious_imr_add(remote_vtep);
return true;
}
Expand Down

0 comments on commit 0704f78

Please sign in to comment.