[code sync] Merge code from sonic-net/sonic-swss:202511 to 202511_azd#225
Merged
mssonicbld merged 3 commits intoJun 2, 2026
Merged
Conversation
Collaborator
mssonicbld
commented
Jun 2, 2026
mssonicbld
commented
…bject (#4620) <!-- 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** In clearPortPhySerdesAttrCounterMap(), changed the log level from SWSS_LOG_ERROR to SWSS_LOG_WARN when a port has no serdes object. **Why I did it** On platforms that do not support serdes, port_serdes_id is SAI_NULL_OBJECT_ID, which is expected behavior. However, this was logged at ERROR level, causing false alarms in loganalyzer. This is the same class of issue fixed in #4467 (getPortSerdesIdFromPortId()), but in a different code path, clearPortPhySerdesAttrCounterMap() iterates all ports and logs ERROR for any port without a serdes object, even on platforms where serdes is simply not implemented. **How I verified it** On a platform that does not support serdes, confirmed that the log no longer appears at ERR level in syslog. **Details if related** Signed-off-by: Sonic Build Admin <sonicbld@microsoft.com>
## Description When an interface is shut/no-shut, configured IPv6 link-local addresses are lost because the kernel removes them on admin-down but they are not replayed on admin-up. This change: 1. Adds handling in `doPortTableTask` to detect admin-up events and replay IPv6 link-local addresses via `replayLLIntfAddresses()` 2. Tracks IPv6 link-local addresses in an in-memory cache (`m_intfLLAddresses`) populated during `doIntfAddrTask` add/del operations 3. On admin-up, replays cached link-local addresses ## Motivation IPv6 link-local addresses configured via CONFIG_DB are removed by the kernel when the interface is administratively shut down. On admin-up, these addresses need to be re-applied. ## Changes - **cfgmgr/intfmgr.cpp**: - Track IPv6 link-local addresses in `m_intfLLAddresses` map during add/del - Conditionally call `replayLLIntfAddresses()` only when link-local addresses exist - Simplify `replayLLIntfAddresses()` to iterate the in-memory cache - **cfgmgr/intfmgr.h**: Add `m_intfLLAddresses` member variable Signed-off-by: Prince Sunny <prsunny@microsoft.com> 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.