[code sync] Merge code from sonic-net/sonic-swss:202511 to 202601#249
Merged
Conversation
mssonicbld
commented
Jun 26, 2026
mssonicbld
commented
Collaborator
<!-- Please make sure you have read and understood the contribution guildlines: https://github.com/Azure/SONiC/blob/gh-pages/CONTRIBUTING.md 1. Make sure your commit includes a signature generted with `git commit -s` 2. Make sure your commit title follows the correct format: [component]: description 3. Make sure your commit message contains enough details about the change and related tests 4. Make sure your pull request adds related reviewers, asignees, labels Please also provide the following information in this pull request: --> **What I did** Removing a check such that old VID mappings are always removed after the successful creation of a new Port PHY Serdes SAI object for the purposes of reconfiguration and replacing the previous one. The order of removal has also been rearranged such that VID mappings are removed before the actual removal of the Port PHY Serdes SAI object. **Why I did it** When a serdes is reconfigured (happens some time after initialization), the SAI object(s) for the Port PHY Serdes Attribute has to be recreated. This means to go look for any objects with references to Port PHY Serdes Attributes, clearing VID references for those objects, and re-creating them. Afterwards, there will be a function call to clear counter ids on the old VID ref'd objects. Currently, this ordering of object removal before VID mapping removal will cause the ERR syslog print: ``` port VID oid:0x90000000008bf, was not found (probably port was removed/ splitted) and will remove from counters now ``` This is a harmless print, but still should not happen nonetheless. It is generating lots of noise. If we are calling `setPortSerdesAttribute()`, then we need a new serdes object. By the time the function removes the old object, it has already successfully created the new one. This means old mappings are no longer needed, regardless of whether if the old object is successfully removed or not. Fixes sonic-net/sonic-swss#4642 **How I verified it** The syslog ERR no longer prints on config reload on TH5. `sonic-mgmt` tests also shows no fallout. **Details if related** 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.