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

Fix preallocated bridge_port_list size #256

Merged
merged 3 commits into from
Jul 18, 2017
Merged

Fix preallocated bridge_port_list size #256

merged 3 commits into from
Jul 18, 2017

Conversation

qiluo-msft
Copy link
Contributor

No description provided.

stcheng
stcheng reviewed Jul 18, 2017
View reviewed changes
orchagent/portsorch.cpp Outdated
@@ -177,7 +177,7 @@ void PortsOrch::removeDefaultVlanMembers()
void PortsOrch::removeDefaultBridgePorts()
{
/* Get bridge ports in default 1Q bridge */
vector<sai_object_id_t> bridge_port_list(m_portCount);
vector<sai_object_id_t> bridge_port_list(m_portCount + 1);
Copy link
Contributor

Choose a reason for hiding this comment

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

why there's an extra bridge port?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

For the CPU port

Copy link
Contributor

Choose a reason for hiding this comment

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

CPU port is also in the list? Could you add one line comment about this?

@stcheng stcheng merged commit 92533e3 into sonic-net:v1.0.1 Jul 18, 2017
@qiluo-msft qiluo-msft deleted the qiluo/fix-portcount branch July 18, 2017 20:33
stcheng pushed a commit that referenced this pull request Jul 19, 2017
Revert "[orchagent]: Temporarily fix pre-allocated bridge_port_list s…
f75ac26 
…ize (#256)"

This reverts commit 92533e3.
praveen-li pushed a commit to praveen-li/sonic-swss that referenced this pull request Aug 24, 2020
Merge remote-tracking branch 'msft_github/master'
63dbfde 
* msft_github/master:
  [swssconfig]: Update Mellanox buffer profile template to work with an incomplete minigraph (sonic-net#332)
  [portsyncd]: Remove deprecated sample file port_config.ini (sonic-net#330)
  [portsyncd]: Remove unused LAG related tables (sonic-net#329)
  [tunnelorch]: Minor comment update
  [aclorch]: Fix crashing when removing ACL table that has associated ACL rules (sonic-net#322)
  [pfcwdorch]: Initial support (sonic-net#317)
  [swssconfig]: Update buffer profile template to work with CONF_DB (sonic-net#319)
  [aclorch]: Refactor doAclTableTask and doAclRuleTask (sonic-net#318)
  [swssconfig]: Add Mellanox PG buffer profiles based on port configuration (sonic-net#301)
  [switchorch]: Add SwitchOrch to deal with switch attributes changes (sonic-net#314)
  [github]: Update pull request template comments
  [github]: Add pull request template (sonic-net#313)
  Optimize orch performance by pops() (sonic-net#312)
  Refactor TableConsumable (sonic-net#291)
  [buffer]: Remove failed tasks from the m_toSync queue (sonic-net#308)
  [qos]: Remove failed tasks from the m_toSync queue (sonic-net#306)
  [aclorch]: Add match TC support for ACL rule (sonic-net#302)
  [orchagent]: Set log recording directory before enable recording (sonic-net#300)
  [orchagent]: Remove duplicate SwSS recording file set code (sonic-net#298)
  Fix port speed validation (sonic-net#288)
  [fdborch]: Fix FdbOrch code to work upon SAI v1.0 (sonic-net#284)
  [config]: Add BGPv6 COPP in 00-copp.config.json (sonic-net#281)
  [aclorch]: Fix match DSCP attribute value mask length to 0x3F
  [mirrororch]: Set the VLAN header only when the packet is mirrored to a VLAN (sonic-net#282)
  [swssconfig]: Log errors instead of throwing exception when file open fails (sonic-net#277)
  [aclorch]: Remove wrong table attribute (sonic-net#280)
  [aclorch]: Fix remove_acl_counter function to remove the counter (sonic-net#274)
  [copporch]: Add SAI_HOSTIF_TRAP_ATTR_TRAP_PRIORITY support and refactor code (sonic-net#270)
  [mirrororch]: Add SAI_MIRROR_SESSION_ATTR_VLAN_HEADER_VALID (sonic-net#269)
  [bufferorch]: Add SAI_BUFFER_PROFILE_THRESHOLD_MODE_* (sonic-net#271)
  [aclorch]: Minor logs fix
  [orchagent]: Update recording file name to swss.rec
  [Make]: Fix type conversions and add more warnings (sonic-net#267)
  [aclorch]: Fix ACL table group attribute type issue (sonic-net#268)
  [portsorch]: Update default bridge port removal logic (sonic-net#263)
  [routeorch]: Need to set drop route next hop ID to NULL (sonic-net#261)
  [portsorch]: Remove SAI_PORT_ATTR_BIND_MODE (sonic-net#262)
  [portsorch]: Create a bridge port with admin status set to UP (sonic-net#259)
  Revert "[portsorch]: Set port bind mode after adding VLAN member" (sonic-net#258)
  [orchagent]: Temporarily fix pre-allocated bridge_port_list size (sonic-net#256)
  [saihelper]: Create initSaiRedis function and put related code inside it (sonic-net#254)
  [portsorch]: Set port bind mode after adding VLAN member (sonic-net#251)
  [orchagent]: Create the switch with source MAC address (sonic-net#253)
  [copporch]: Add UDLD entry in COPP (sonic-net#252)
  [orchagent]: Support LAG/VLAN with SAI 1.0 (sonic-net#250)
  use vlan oid instead of vlan id (sonic-net#247)
  Fix getBridgePort: handle non existing bridge_port_id
  Integration for SAI v1.0.1
  Remove vlan member before removing bridge port
  Fix SAI functional calls
  Fix: store bridge ports at initialization
  Refactor vector<attr>
  Resolve review comments
  Implement bridge port in portsorch
  Fix initSystemAclTable: bind system ACL to each port
  Refactor: port owns acl table group
  Resolve code review comments
  Resolve code review comments
  Adpat SAIv1.0 headers and fix compilation errors
EdenGri pushed a commit to EdenGri/sonic-swss that referenced this pull request Feb 28, 2022
@yangbashuang @jleveque
Fix teamshow issues due to dependencies on minigraph (sonic-net#256)
c8b9c0e
oleksandrivantsiv pushed a commit to oleksandrivantsiv/sonic-swss that referenced this pull request Mar 1, 2023
@marian-pritsak @qiluo-msft
[syncd_flex_counter.cpp]: Move lock_guard to narrow scope (sonic-net#256
5dddf52 
)

lock_guard holds mutex during sleep, which does not allow other threads
to acquire it for most of time. It is moved to a scope that actually
needs this mutex.

Signed-off-by: marian-pritsak <[email protected]>
lukasstockner pushed a commit to genesiscloud/sonic-swss that referenced this pull request Apr 2, 2023
@prgeor
split i2c read across pages (sonic-net#256)
ee12215
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@stcheng stcheng stcheng approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@qiluo-msft @stcheng @msftclas