Skip to content

Fix for "orchagent crashed when trying to delete fdb static entry with swssconfig #11046" #2332

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

Merged
prsunny merged 12 commits into from
Jun 22, 2022
Merged

Fix for "orchagent crashed when trying to delete fdb static entry with swssconfig #11046" #2332

Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
d40b538
vlanmgr changes related to EVPN VxLan warmboot
anilkpandey Oct 9, 2020
92b3d2e
Merge remote-tracking branch 'upstream/master'
anilkpandey Oct 15, 2020
4d0931a
Update vlanmgr.cpp
anilkpandey Nov 17, 2020
9c9d797
Update vlanmgr.cpp
anilkpandey Dec 2, 2020
5edb7a3
Merge remote-tracking branch 'upstream/master'
anilkpandey Dec 7, 2020
53abc67
Update test_warm_reboot.py
anilkpandey Dec 7, 2020
961827b
Update test_warm_reboot.py
anilkpandey Dec 8, 2020
5569d66
Update test_warm_reboot.py
anilkpandey Dec 17, 2020
d714132
change state back to reconciled as per latest design
anilkpandey Dec 18, 2020
99283f2
Merge remote-tracking branch 'upstream/master'
anilkpandey Jun 15, 2022
ddf9709
updated to not flush static mac
anilkpandey Jun 15, 2022
bf34acf
Update fdborch.cpp
anilkpandey Jun 15, 2022
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
12 changes: 11 additions & 1 deletion orchagent/fdborch.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -899,7 +899,12 @@ void FdbOrch::doTask(NotificationConsumer& consumer)
{
if (op == "ALL")
{
status = sai_fdb_api->flush_fdb_entries(gSwitchId, 0, NULL);
vector<sai_attribute_t> attrs;
sai_attribute_t attr;
attr.id = SAI_FDB_FLUSH_ATTR_ENTRY_TYPE;
attr.value.s32 = SAI_FDB_FLUSH_ENTRY_TYPE_DYNAMIC;
attrs.push_back(attr);
status = sai_fdb_api->flush_fdb_entries(gSwitchId, (uint32_t)attrs.size(), attrs.data());
if (status != SAI_STATUS_SUCCESS)
{
SWSS_LOG_ERROR("Flush fdb failed, return code %x", status);
Expand Down Expand Up @@ -1056,6 +1061,11 @@ void FdbOrch::flushFDBEntries(sai_object_id_t bridge_port_oid,
attr.value.oid = vlan_oid;
attrs.push_back(attr);
}

/* do not flush static mac */
attr.id = SAI_FDB_FLUSH_ATTR_ENTRY_TYPE;
Copy link
Copy Markdown
Contributor

@gechiang gechiang Jun 20, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

With this change added here it means for any "FDB flush" operations whether it is based on port, or VLAN it will never flush out Static MACs. Not sure if this may impact MLAG operations where they may want to flush out remotely learnt MAC that were programmed as Static MAC? Adding MLAG owner @Praveen-Brcm to the review to ensure this is ok.

Copy link
Copy Markdown
Contributor

@Praveen-Brcm Praveen-Brcm Jun 21, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@gechiang : MCLAG remote MAC's are programmed dynamic with aging disabled instead of STATIC MAC. this change will not affect the MCLAG. Thanks

attr.value.s32 = SAI_FDB_FLUSH_ENTRY_TYPE_DYNAMIC;
attrs.push_back(attr);

SWSS_LOG_INFO("Flushing FDB bridge_port_oid: 0x%" PRIx64 ", and bvid_oid:0x%" PRIx64 ".", bridge_port_oid, vlan_oid);

Expand Down