-
Notifications
You must be signed in to change notification settings - Fork 543
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
Fix for "orchagent crashed when trying to delete fdb static entry with swssconfig #11046" #2332
Conversation
Change back state to REPLAYED
@@ -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; |
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
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
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good to me.
…h swssconfig #11046" (#2332) * Fix updated to not flush static mac
2022-06-24 93af69c: [PFC_WD] Avoid applying ZeroBuffer Profiles to ingress PG when a PFC storm is detected (sonic-net/sonic-swss#2304) 2022-06-24 37349cf: [swssconfig] Optimize performance of swssconfig (sonic-net/sonic-swss#2336) 2022-06-24 84e9b07: [fdborch] fix heap-use-after-free in clearFdbEntry() (sonic-net/sonic-swss#2353) 2022-06-24 1b8bd94: Create ACL table fails due to incorrect check for supported ACL actions #11235 (sonic-net/sonic-swss#2351) 2022-06-24 1ed0b4b: [macsec] Refactor the logic of macsec name map (sonic-net/sonic-swss#2348) 2022-06-23 f88f992: [mock_tests] Add Sflow Orch UTs (sonic-net/sonic-swss#2295) 2022-06-23 ec57bf1: [macsec] Update macsec flex counter (sonic-net/sonic-swss#2338) 2022-06-22 6e0fc85: [ACL] Support stage particular match fields (sonic-net/sonic-swss#2341) 2022-06-22 efb4530: [orchagent, DTel]: report session support to set user vrf (sonic-net/sonic-swss#2326) 2022-06-22 d82874d: Fix for "orchagent crashed when trying to delete fdb static entry with swssconfig #11046" (sonic-net/sonic-swss#2332) 2022-06-22 0c789e6: Fix qos map test in vs test (sonic-net/sonic-swss#2343) 2022-06-17 1bb5070: Enhance mock test for dynamic buffer manager for port removing and qos reload flows (sonic-net/sonic-swss#2262) 2022-06-16 700492f: [aclorch] Fix and simplify DTel watchlist tables and entries (sonic-net/sonic-swss#2155)
This commit could not be cleanly cherry-picked to 202012. Please submit another PR. |
@qiluo-msft, I will create the PR on 202012 this week. |
@qiluo-msft, created PR #2374 |
…h swssconfig #11046" (sonic-net#2332) * Fix updated to not flush static mac
202012 branch PR merged: #2374 |
…h swssconfig #11046" (sonic-net#2332) * Fix updated to not flush static mac
Root cause:
When fdb flush was issued after adding a static mac, the mac was deleted due to the flush. Then when we try to remove the static mac, it thrown error and crashed due to the mac not found.
Fix:
Updated fdb flush to flush only dynamic mac.