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

Jump to bottom

[mlag]Fix dynamic local fdb not save to state db #1932

Open
wants to merge 11 commits into
base: master
Choose a base branch
from
Open

[mlag]Fix dynamic local fdb not save to state db #1932

Changes from 5 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
7ae60ca
change some code for trigger build
pettershao-ragilenetworks May 8, 2021
ebb1554
Merge branch 'master' of https://github.com/pettershao-ragilenetworks…
pettershao-ragilenetworks Jul 8, 2021
0e4b607
Merge https://github.com/Azure/sonic-swss
pettershao-ragilenetworks Sep 23, 2021
835a851
Merge https://github.com/Azure/sonic-swss into fix_dynamic_local_fdb_…
pettershao-ragilenetworks Sep 26, 2021
e9d6e2b
[mlag] fix fdb not save to state db when type is dynamic_local
pettershao-ragilenetworks Sep 26, 2021
2a08640
Update fdborch.cpp
pettershao-ragilenetworks Oct 8, 2021
61c152e
add vstest
pettershao-ragilenetworks Oct 14, 2021
614df1a
fix error
pettershao-ragilenetworks Oct 14, 2021
ea5bd1b
fix spell error
pettershao-ragilenetworks Oct 14, 2021
e488c1c
fix vstest
pettershao-ragilenetworks Oct 15, 2021
b158eb4
triggle rebuild
pettershao-ragilenetworks Feb 9, 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
9 changes: 6 additions & 3 deletions orchagent/fdborch.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1392,8 +1392,7 @@ bool FdbOrch::addFdbEntry(const FdbEntry& entry, const string& port_name,

string key = "Vlan" + to_string(vlan.m_vlan_info.vlan_id) + ":" + entry.mac.to_string();

if ((fdbData.origin != FDB_ORIGIN_MCLAG_ADVERTIZED) &&
(fdbData.origin != FDB_ORIGIN_VXLAN_ADVERTIZED))
if (dbData.origin != FDB_ORIGIN_VXLAN_ADVERTIZED)
{
/* State-DB is updated only for Local Mac addresses */
// Write to StateDb
Expand All @@ -1403,7 +1402,11 @@ bool FdbOrch::addFdbEntry(const FdbEntry& entry, const string& port_name,
fvs.push_back(FieldValueTuple("type", "dynamic"));
else
fvs.push_back(FieldValueTuple("type", fdbData.type));
m_fdbStateTable.set(key, fvs);
if(fdbData.origin != FDB_ORIGIN_MCLAG_ADVERTIZED ||
pettershao-ragilenetworks marked this conversation as resolved.
Show resolved Hide resolved
fdbData.type == "dynamic_local")
{
m_fdbStateTable.set(key, fvs);
}
}

else if (macUpdate && (oldOrigin != FDB_ORIGIN_MCLAG_ADVERTIZED) &&
Expand Down