[code sync] Merge code from sonic-net/sonic-sairedis:202511 to 202603#128
Merged
Conversation
mssonicbld
commented
Apr 30, 2026
mssonicbld
commented
Collaborator
…alue (#1872) #### Why I did it PORT_PHY_ATTR::collectData in FlexCounter.cpp calls `initAttrData` without checking its return value. When Broadcom SAI does not support attributes like `SAI_PORT_ATTR_RX_SIGNAL_DETECT` (attribute 149), the subsequent `sai_get` call fails with `Feature unavailable (0xfffffff0)`, generating ERR-level syslog entries every ~10 seconds (FlexCounter polling interval). This causes **all tests using loganalyzer** to fail at teardown on Arista-7260CX3 (Broadcom) platforms. On 202511 image `20251110.20`, this produced **8,700+ test failures**. The regression is triggered by the combination of: - sonic-sairedis #1674 / #1785 (adds PORT_PHY_ATTR FlexCounter polling support) - sonic-swss #4223 / #4407 (activates PORT_PHY_ATTR polling via FLEX_COUNTER_DB entries) A partial fix was applied in #1799 / #1815 for PORT_PHY_SERDES_ATTR::collectData, but the same fix was **not** applied to PORT_PHY_ATTR::collectData. #### How I did it - Changed `initAttrData` return type from `void` to `bool` - Each switch case now returns `true` on success, error paths return `false` - In `collectData`, check the return value of `initAttrData` in the init loop - If any attribute initialization fails, log a WARN and skip the entire object (`continue`) - This matches the pattern already used in PORT_PHY_SERDES_ATTR::collectData (fixed by #1799) #### How to verify it 1. Deploy on an Arista-7260CX3 (Broadcom) testbed with 202511 image 2. Verify no more `RX signal detect` ERR syslog entries from syncd 3. Run any test with loganalyzer enabled — teardown should pass #### Related PRs - #1674 — PORT_PHY_ATTR flex counter support (master) - #1785 — cherry-pick to 202511 - #1799 — Partial fix for PORT_PHY_SERDES_ATTR (master) - #1815 — cherry-pick of #1799 to 202511 - #1855 — Same fix targeting 202511 branch - sonic-swss #4223 / #4407 — Activation trigger #### ADO Reference - Microsoft ADO PBI: 37325902 - Arista issue: https://github.com/aristanetworks/sonic-qual.msft/issues/1232 - Public tracking: sonic-net/sonic-mgmt#24023 Signed-off-by: Sonic Build Admin <sonicbld@microsoft.com>
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.