[code sync] Merge code from sonic-net/sonic-buildimage:202505 to 202506#1673
Merged
prabhataravind merged 8 commits intoAzure:202506from Oct 2, 2025
Merged
Conversation
Collaborator
mssonicbld
commented
Sep 27, 2025
mssonicbld
commented
<!-- Please make sure you've read and understood our contributing guidelines: https://github.com/Azure/SONiC/blob/gh-pages/CONTRIBUTING.md failure_prs.log skip_prs.log Make sure all your commits include a signature generated with `git commit -s` ** If this is a bug fix, make sure your description includes "fixes #xxxx", or "closes #xxxx" or "resolves #xxxx" Please provide the following information: --> #### Why I did it To avoid error message is syslog during shutdown flow related to SDK monitor thread. Error message was observed only during shutdown flow, hence there was no functional impact, just error log. It was not always reproducible because the reason for it was race condition related to monitor thread. ##### Work item tracking - Microsoft ADO **(number only)**: #### How I did it During shutdown flow stop SDK monitor thread before actual SDK shutdown in order to avoid race condition. #### How to verify it By running any type of reboot or config reload <!-- If PR needs to be backported, then the PR must be tested against the base branch and the earliest backport release branch and provide tested image version on these two branches. For example, if the PR is requested for master, 202211 and 202012, then the requester needs to provide test results on master and 202012. --> #### Which release branch to backport (provide reason below if selected) <!-- - Note we only backport fixes to a release branch, *not* features! - Please also provide a reason for the backporting below. - e.g. - [x] 202006 --> - [ ] 202205 - [ ] 202211 - [ ] 202305 - [ ] 202311 - [ ] 202405 - [ ] 202411 - [ ] 202505 #### Tested branch (Please provide the tested image version) <!-- - Please provide tested image version - e.g. - [x] 20201231.100 --> - [ ] <!-- image version 1 --> - [ ] <!-- image version 2 --> #### Description for the changelog <!-- Write a short (one line) summary that describes the changes in this pull request for inclusion in the changelog: --> <!-- Ensure to add label/tag for the feature raised. example - PR#2174 under sonic-utilities repo. where, Generic Config and Update feature has been labelled as GCU. --> #### Link to config_db schema for YANG module changes <!-- Provide a link to config_db schema for the table for which YANG model is defined Link should point to correct section on https://github.com/Azure/sonic-buildimage/blob/master/src/sonic-yang-models/doc/Configuration.md --> #### A picture of a cute animal (not mandatory but encouraged)
…m port counter (#24122) <!-- Please make sure you've read and understood our contributing guidelines: https://github.com/Azure/SONiC/blob/gh-pages/CONTRIBUTING.md failure_prs.log skip_prs.log Make sure all your commits include a signature generated with `git commit -s` ** If this is a bug fix, make sure your description includes "fixes #xxxx", or "closes #xxxx" or "resolves #xxxx" Please provide the following information: --> #### Why I did it This PR is to set `sai_stats_support_mask` to `0x800` for Moby HWSKUs. This is a continuation of sonic-net/sonic-buildimage#23772 ##### Work item tracking * Microsoft ADO **34515971**: * CSP **CS00012419125** #### How I did it Update config.bcm #### How to verify it The change is verified by running PFCWD test on a physical testbed. <!-- If PR needs to be backported, then the PR must be tested against the base branch and the earliest backport release branch and provide tested image version on these two branches. For example, if the PR is requested for master, 202211 and 202012, then the requester needs to provide test results on master and 202012. --> #### Which release branch to backport (provide reason below if selected) <!-- - Note we only backport fixes to a release branch, *not* features! - Please also provide a reason for the backporting below. - e.g. - [x] 202006 --> - [ ] 202205 - [ ] 202211 - [ ] 202305 - [ ] 202311 - [ ] 202405 - [ ] 202411 - [x] 202505 #### Tested branch (Please provide the tested image version) <!-- - Please provide tested image version - e.g. - [x] 20201231.100 --> - [ ] <!-- image version 1 --> - [ ] <!-- image version 2 --> #### Description for the changelog <!-- Write a short (one line) summary that describes the changes in this pull request for inclusion in the changelog: --> Set `sai_stats_support_mask` to `0x800` for Moby HWSKUs. <!-- Ensure to add label/tag for the feature raised. example - PR#2174 under sonic-utilities repo. where, Generic Config and Update feature has been labelled as GCU. --> #### Link to config_db schema for YANG module changes <!-- Provide a link to config_db schema for the table for which YANG model is defined Link should point to correct section on https://github.com/Azure/sonic-buildimage/blob/master/src/sonic-yang-models/doc/Configuration.md --> #### A picture of a cute animal (not mandatory but encouraged)
… to fix oper down and Syncd crash on cold boot (#24120) fixes: #23943 <!-- Please make sure you've read and understood our contributing guidelines: https://github.com/Azure/SONiC/blob/gh-pages/CONTRIBUTING.md failure_prs.log skip_prs.log Make sure all your commits include a signature generated with `git commit -s` ** If this is a bug fix, make sure your description includes "fixes #xxxx", or "closes #xxxx" or "resolves #xxxx" Please provide the following information: --> #### Why I did it Fix a bug on the Arista-7060CX-32S-Q32 ##### Work item tracking - Microsoft ADO **(number only)**: 34827366 #### How I did it Added a missing configuration line #### How to verify it <!-- If PR needs to be backported, then the PR must be tested against the base branch and the earliest backport release branch and provide tested image version on these two branches. For example, if the PR is requested for master, 202211 and 202012, then the requester needs to provide test results on master and 202012. --> I tested this by manually adding ``` sai_interface_type_auto_detect=0 ``` to the `th-a7060-cx32s-32x40G-t0.config.bcm` file on an Arista-7060CX-32S-Q32 (the same one that was used to originally repro in #23943) running 202505 then did a cold reboot. After boot all ports were operationally up and there were no SYNCD dumps seen in syslog Also, tested warmboot from 202411->202505 and 202505->202505 with the fix in place and there were no SYNCD dumps seen in syslog and the interfaces came up. #### Which release branch to backport (provide reason below if selected) <!-- - Note we only backport fixes to a release branch, *not* features! - Please also provide a reason for the backporting below. - e.g. - [x] 202006 --> - [ ] 202205 - [ ] 202211 - [ ] 202305 - [ ] 202311 - [ ] 202405 - [ ] 202411 - [x] 202505 #### Tested branch (Please provide the tested image version) <!-- - Please provide tested image version - e.g. - [x] 20201231.100 --> - [x] 202505.21 #### Description for the changelog <!-- Write a short (one line) summary that describes the changes in this pull request for inclusion in the changelog: --> Added missing sai_interface_type_auto_detect option on Arista-7060CX-32S to resolve syncd crash <!-- Ensure to add label/tag for the feature raised. example - PR#2174 under sonic-utilities repo. where, Generic Config and Update feature has been labelled as GCU. --> #### Link to config_db schema for YANG module changes <!-- Provide a link to config_db schema for the table for which YANG model is defined Link should point to correct section on https://github.com/Azure/sonic-buildimage/blob/master/src/sonic-yang-models/doc/Configuration.md --> #### A picture of a cute animal (not mandatory but encouraged)
… automatically (#24119) #### Why I did it src/sonic-platform-common ``` * 2c5fd51 - (HEAD -> 202505, origin/202505) [Smartswitch] Restart sensord with lock (Azure#602) (3 hours ago) [mssonicbld] ``` #### How I did it #### How to verify it #### Description for the changelog
Collaborator
Author
|
/azp run |
|
Azure Pipelines will not run the associated pipelines, because the pull request was updated after the run command was issued. Review the pull request again and issue a new run command. |
<!-- Please make sure you've read and understood our contributing guidelines: https://github.com/Azure/SONiC/blob/gh-pages/CONTRIBUTING.md failure_prs.log Make sure all your commits include a signature generated with `git commit -s` ** If this is a bug fix, make sure your description includes "fixes #xxxx", or "closes #xxxx" or "resolves #xxxx" Please provide the following information: --> #### Why I did it Disable pfc and pfcwd on service ports since they carry lossy traffic and do not require any pfc config ##### Work item tracking - Microsoft ADO **(number only)**: #### How I did it Finetune buffer and qos configs #### How to verify it Copy templates onto switch, reload the config and see the new config db <!-- If PR needs to be backported, then the PR must be tested against the base branch and the earliest backport release branch and provide tested image version on these two branches. For example, if the PR is requested for master, 202211 and 202012, then the requester needs to provide test results on master and 202012. --> #### Which release branch to backport (provide reason below if selected) <!-- - Note we only backport fixes to a release branch, *not* features! - Please also provide a reason for the backporting below. - e.g. - [x] 202006 --> - [ ] 202205 - [ ] 202211 - [ ] 202305 - [ ] 202311 - [ ] 202405 - [ ] 202411 - [X] 202505 #### Tested branch (Please provide the tested image version) <!-- - Please provide tested image version - e.g. - [x] 20201231.100 --> - [ ] <!-- image version 1 --> - [ ] <!-- image version 2 --> #### Description for the changelog <!-- Write a short (one line) summary that describes the changes in this pull request for inclusion in the changelog: --> Disable PFC and PFCWD on service ports <!-- Ensure to add label/tag for the feature raised. example - PR#2174 under sonic-utilities repo. where, Generic Config and Update feature has been labelled as GCU. --> #### Link to config_db schema for YANG module changes <!-- Provide a link to config_db schema for the table for which YANG model is defined Link should point to correct section on https://github.com/Azure/sonic-buildimage/blob/master/src/sonic-yang-models/doc/Configuration.md --> All unit tests pass ``` collected 312 items tests/test_cfggen.py .................................................................................... [ 26%] tests/test_cfggen_from_yang.py .................. [ 32%] tests/test_cfggen_pfx_filter.py . [ 33%] tests/test_cfggen_platformJson.py ...... [ 34%] tests/test_cfggen_t2_chassis_fe.py ...... [ 36%] tests/test_chassis_cfggen.py ......................................................... [ 55%] tests/test_frr.py ...... [ 57%] tests/test_j2files.py ................................................ [ 72%] tests/test_j2files_t2_chassis_fe.py ... [ 73%] tests/test_minigraph_case.py ........................................... [ 87%] tests/test_multinpu_cfggen.py ........................................ [100%] ===================================================================== 312 passed in 321.99s (0:05:21) ================================== ``` #### A picture of a cute animal (not mandatory but encouraged)
mssonicbld
force-pushed
the
sonicbld/202506-merge
branch
from
4489e4b to
f2f523b
Compare
Collaborator
Author
|
/azp run |
|
Azure Pipelines will not run the associated pipelines, because the pull request was updated after the run command was issued. Review the pull request again and issue a new run command. |
<!-- Please make sure you've read and understood our contributing guidelines: https://github.com/Azure/SONiC/blob/gh-pages/CONTRIBUTING.md failure_prs.log Make sure all your commits include a signature generated with `git commit -s` ** If this is a bug fix, make sure your description includes "fixes #xxxx", or "closes #xxxx" or "resolves #xxxx" Please provide the following information: --> Remove config keys for pfc and pfcwd on service ports #### Why I did it By setting the keys to an empty string "" for `pfcwd_sw_enable`, the buffermgrd still creates corresponding entries in the `PFC_WD` table. This in turn misleads the pfcwd orch to check for TCs where PFCWD is enabled on those service ports which it cannot find since it's an empty string resulting in this constant error stream: ``` 2025 Sep 27 12:56:29.631650 str5-7060x6-moby-512-2 NOTICE swss#orchagent: :- registerInWdDb: No lossless TC found on port Ethernet512 2025 Sep 27 12:56:29.631650 str5-7060x6-moby-512-2 ERR swss#orchagent: :- createEntry: Failed to start PFC Watchdog on port Ethernet512 2025 Sep 27 12:56:29.631650 str5-7060x6-moby-512-2 NOTICE swss#orchagent: :- registerInWdDb: No lossless TC found on port Ethernet513 2025 Sep 27 12:56:29.631680 str5-7060x6-moby-512-2 ERR swss#orchagent: :- createEntry: Failed to start PFC Watchdog on port Ethernet513 2025 Sep 27 12:56:29.969523 str5-7060x6-moby-512-2 NOTICE swss#orchagent: :- registerInWdDb: No lossless TC found on port Ethernet512 2025 Sep 27 12:56:29.969523 str5-7060x6-moby-512-2 ERR swss#orchagent: :- createEntry: Failed to start PFC Watchdog on port Ethernet512 2025 Sep 27 12:56:29.969523 str5-7060x6-moby-512-2 NOTICE swss#orchagent: :- registerInWdDb: No lossless TC found on port Ethernet513 2025 Sep 27 12:56:29.969523 str5-7060x6-moby-512-2 ERR swss#orchagent: :- createEntry: Failed to start PFC Watchdog on port Ethernet513 ``` Fix here is to completely remove the key config to prevent buffermgrd in creating PFCWD entries for those service ports. Issue was not found earlier since the error messages take about 15 minutes to show up from a reload. ##### Work item tracking - Microsoft ADO **(number only)**: #### How I did it #### How to verify it <!-- If PR needs to be backported, then the PR must be tested against the base branch and the earliest backport release branch and provide tested image version on these two branches. For example, if the PR is requested for master, 202211 and 202012, then the requester needs to provide test results on master and 202012. --> #### Which release branch to backport (provide reason below if selected) <!-- - Note we only backport fixes to a release branch, *not* features! - Please also provide a reason for the backporting below. - e.g. - [x] 202006 --> - [ ] 202205 - [ ] 202211 - [ ] 202305 - [ ] 202311 - [ ] 202405 - [ ] 202411 - [X] 202505 #### Tested branch (Please provide the tested image version) <!-- - Please provide tested image version - e.g. - [x] 20201231.100 --> - [ ] <!-- image version 1 --> - [ ] <!-- image version 2 --> #### Description for the changelog <!-- Write a short (one line) summary that describes the changes in this pull request for inclusion in the changelog: --> Completely remove config keys for pfc and pfcwd on service ports <!-- Ensure to add label/tag for the feature raised. example - PR#2174 under sonic-utilities repo. where, Generic Config and Update feature has been labelled as GCU. --> #### Link to config_db schema for YANG module changes <!-- Provide a link to config_db schema for the table for which YANG model is defined Link should point to correct section on https://github.com/Azure/sonic-buildimage/blob/master/src/sonic-yang-models/doc/Configuration.md --> #### A picture of a cute animal (not mandatory but encouraged)
mssonicbld
force-pushed
the
sonicbld/202506-merge
branch
from
f2f523b to
2720a47
Compare
Collaborator
Author
|
/azp run |
|
Azure Pipelines will not run the associated pipelines, because the pull request was updated after the run command was issued. Review the pull request again and issue a new run command. |
mssonicbld
force-pushed
the
sonicbld/202506-merge
branch
from
2720a47 to
0c0ceba
Compare
Collaborator
Author
|
/azp run |
|
Azure Pipelines will not run the associated pipelines, because the pull request was updated after the run command was issued. Review the pull request again and issue a new run command. |
mssonicbld
force-pushed
the
sonicbld/202506-merge
branch
from
0c0ceba to
f374c3d
Compare
Collaborator
Author
|
/azp run |
|
Azure Pipelines will not run the associated pipelines, because the pull request was updated after the run command was issued. Review the pull request again and issue a new run command. |
<!-- Please make sure you've read and understood our contributing guidelines: https://github.com/Azure/SONiC/blob/gh-pages/CONTRIBUTING.md failure_prs.log skip_prs.log Make sure all your commits include a signature generated with `git commit -s` ** If this is a bug fix, make sure your description includes "fixes #xxxx", or "closes #xxxx" or "resolves #xxxx" Please provide the following information: --> #### Why I did it Update the device data for Nokia platforms ##### Work item tracking - Microsoft ADO **(number only)**: #### How I did it Adde files sysObjectID.txt which contain the Nokia product system OID definition for the following platforms for Internal use. Nokia-7215-A1 Nokia-IXR7220-D4-36D Nokia-IXR7220-H4-64D Nokia-IXR7250-X3B #### How to verify it The following files should exist. device/nokia/arm64-nokia_ixs7215_52xb-r0/sysObjectID.txt device/nokia/x86_64-nokia_ixr7220_d4-r0/sysObjectID.txt device/nokia/x86_64-nokia_ixr7220_h4-r0/sysObjectID.txt device/nokia/x86_64-nokia_ixr7250_x3b-r0/sysObjectID.txt <!-- If PR needs to be backported, then the PR must be tested against the base branch and the earliest backport release branch and provide tested image version on these two branches. For example, if the PR is requested for master, 202211 and 202012, then the requester needs to provide test results on master and 202012. --> #### Which release branch to backport (provide reason below if selected) <!-- - Note we only backport fixes to a release branch, *not* features! - Please also provide a reason for the backporting below. - e.g. - [x] 202006 --> - [ ] 202205 - [ ] 202211 - [ ] 202305 - [ ] 202311 - [ ] 202405 - [ ] 202411 - [x] 202505 #### Tested branch (Please provide the tested image version) <!-- - Please provide tested image version - e.g. - [x] 20201231.100 --> - [ ] <!-- image version 1 --> - [ ] <!-- image version 2 --> #### Description for the changelog <!-- Write a short (one line) summary that describes the changes in this pull request for inclusion in the changelog: --> <!-- Ensure to add label/tag for the feature raised. example - PR#2174 under sonic-utilities repo. where, Generic Config and Update feature has been labelled as GCU. --> #### Link to config_db schema for YANG module changes <!-- Provide a link to config_db schema for the table for which YANG model is defined Link should point to correct section on https://github.com/Azure/sonic-buildimage/blob/master/src/sonic-yang-models/doc/Configuration.md --> #### A picture of a cute animal (not mandatory but encouraged)
mssonicbld
force-pushed
the
sonicbld/202506-merge
branch
from
f374c3d to
071d572
Compare
Collaborator
Author
|
/azp run |
|
Azure Pipelines will not run the associated pipelines, because the pull request was updated after the run command was issued. Review the pull request again and issue a new run command. |
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
prabhataravind
approved these changes
Oct 2, 2025
bingwang-ms
pushed a commit
that referenced
this pull request
Jan 16, 2026
…tically (#24396) #### Why I did it src/sonic-sairedis ``` * ebdf9e97 - (HEAD -> master, origin/master, origin/HEAD) Support Sonic-VPP CRM counters for localsid. (#1673) (4 days ago) [dypet] * 1a75149c - Fix DASH FlexCounter bulk get ENI meter class range (#1669) (10 days ago) [Mukesh Moopath Velayudhan] * 7a116435 - Reduce severity of log for unallowed enum value (#1675) (2 weeks ago) [Connor Roos] ``` #### How I did it #### How to verify it #### Description for the changelog
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
2 participants
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.