[code sync] Merge code from sonic-net/sonic-swss:202605 to 202606 - #287
Merged
Conversation
mssonicbld
commented
Aug 25, 2026
mssonicbld
commented
Collaborator
## Summary - Remove the Mellanox-specific workaround in `routeorch.cpp` that divided `SAI_SWITCH_ATTR_NUMBER_OF_ECMP_GROUPS` by 32 - The vendor SDK now returns the true hardware ECMP group limit (4200) directly, making the divisor unnecessary - With the divisor still applied, `m_maxNextHopGroupCount` is incorrectly set to 131 (4200/32), preventing the system from utilizing the full 4200 ECMP groups ## Background The SDK previously returned the KVD size (~512K) for `SAI_SWITCH_ATTR_NUMBER_OF_ECMP_GROUPS`, assuming each ECMP group has only 1 member. The `/= 32` workaround compensated for this by estimating the real limit when the max group size is 32. The SDK has since been fixed to return the actual hardware limit (4200) directly. With this fix applied, the `/= 32` workaround produces an artificially low value of 131, which causes: - `MAX_NEXTHOP_GROUP_COUNT` in STATE_DB to be 131 - CRM test `test_crm_nexthop_group(group_member=True)` to fail because the system cannot create enough NHG entries during the pre-warm phase <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit * **Refactor** CODE_OF_CONDUCT.md LICENSE README.md SECURITY.md SUPPORT.md azure-pipelines failure_prs.log scripts skip_prs.log Removed platform-specific ECMP scaling so routing uses a single, consistent default ECMP group capacity across all platforms. CODE_OF_CONDUCT.md LICENSE README.md SECURITY.md SUPPORT.md azure-pipelines failure_prs.log scripts skip_prs.log Increased the fallback ECMP group capacity used when hardware-reported values are unavailable, improving default path capacity and making behavior more predictable. <!-- end of auto-generated comment: release notes by coderabbit.ai --> Signed-off-by: Sonic Build Admin <sonicbld@microsoft.com>
|
Azure Pipelines: There may be pipelines that require an authorized user to comment /azp run to run. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.