Skip to content

Fork Sync: Update from parent repository #12

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
github-actions merged 8 commits into from
Nov 26, 2024
Merged

Fork Sync: Update from parent repository #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c865803
[mirror] erspan ipv6 underlay (see PR #1817) (#3317)
mramezani95 Nov 18, 2024
0b331f0
platform/innovium renaming to platform/marvell-teralynx (#3252)
krismarvell Nov 19, 2024
c86efa1
Added support for "UNDERLAY_SET_DSCP" and "UNDERLAY_SET_DSCPV6" table…
siqbal1986 Nov 20, 2024
1843de4
Ensure second route group OID is correct (#3380)
theasianpianist Nov 20, 2024
eda63a9
Vlanmgrd handling of portchannel does not exist more gracefully. (#3367)
abdosi Nov 21, 2024
3d5ac54
Create counter for the queue to which the host CPU traffic is sent wh…
stephenxs Nov 22, 2024
1847195
Add port FEC BER feature swss, HLD#1829 (#3363)
vincentpcng Nov 22, 2024
04255e0
Skip route group immutable test (#3393)
theasianpianist Nov 26, 2024
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
18 changes: 17 additions & 1 deletion cfgmgr/vlanmgr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,17 @@ bool VlanMgr::addHostVlanMember(int vlan_id, const string &port_alias, const str
cmds << BASH_CMD " -c " << shellquote(inner.str());

std::string res;
EXEC_WITH_ERROR_THROW(cmds.str(), res);
try
{
EXEC_WITH_ERROR_THROW(cmds.str(), res);
}
catch (const std::runtime_error& e)
{
if (!isMemberStateOk(port_alias))
return false;
else
EXEC_WITH_ERROR_THROW(cmds.str(), res);
}

return true;
}
Expand Down Expand Up @@ -632,6 +642,12 @@ void VlanMgr::doVlanMemberTask(Consumer &consumer)

m_vlanMemberReplay.erase(kfvKey(t));
}
else
{
SWSS_LOG_INFO("Netdevice for %s not ready, delaying", kfvKey(t).c_str());
it++;
continue;
}
}
else if (op == DEL_COMMAND)
{
Expand Down
2 changes: 1 addition & 1 deletion orchagent/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ swssdir = $(datadir)/swss
dist_swss_DATA = \
eliminate_events.lua \
rif_rates.lua \
pfc_detect_innovium.lua \
pfc_detect_marvell_teralynx.lua \
pfc_detect_mellanox.lua \
pfc_detect_broadcom.lua \
pfc_detect_marvell.lua \
Expand Down
Loading