[code sync] Merge code from sonic-net/sonic-buildimage:202505 to 202506#1965
Open
mssonicbld wants to merge 27 commits intoAzure:202506from
Open
[code sync] Merge code from sonic-net/sonic-buildimage:202505 to 202506#1965mssonicbld wants to merge 27 commits intoAzure:202506from
mssonicbld wants to merge 27 commits intoAzure:202506from
Conversation
Collaborator
mssonicbld
commented
Jan 31, 2026
mssonicbld
commented
…ically (#25242) #### Why I did it src/sonic-restapi ``` * 66d1605 - (HEAD -> 202505, origin/202505) [Pfx_len] Extend prefix length for routes and advertisement (Azure#181) (9 days ago) [mssonicbld] ``` #### How I did it #### How to verify it #### Description for the changelog
Collaborator
Author
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
mssonicbld
force-pushed
the
sonicbld/202506-merge
branch
from
ab53810 to
24bc6ce
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. |
…tomatically (#25239) #### Why I did it src/sonic-linux-kernel ``` * dbb27c6 - (HEAD -> 202505, origin/202505) update docker slave name (Azure#527) (4 days ago) [yijingyan2] ``` #### How I did it #### How to verify it #### Description for the changelog
mssonicbld
force-pushed
the
sonicbld/202506-merge
branch
from
24bc6ce to
d46757f
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. |
Collaborator
Author
|
/azp run |
mssonicbld
force-pushed
the
sonicbld/202506-merge
branch
from
d46757f to
2b5fa68
Compare
|
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. |
…omatically (#25317) #### Why I did it src/sonic-swss-common ``` * 084b495 - (HEAD -> 202505, origin/202505) Create a new PORT_PHY_ATTR table (Azure#1145) (48 minutes ago) [mssonicbld] ``` #### How I did it #### How to verify it #### Description for the changelog
mssonicbld
force-pushed
the
sonicbld/202506-merge
branch
from
2b5fa68 to
9746b3c
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
9746b3c to
42baede
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
42baede to
4730eb1
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
4730eb1 to
559df31
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
559df31 to
1596e2b
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. |
Collaborator
Author
|
/azp run |
mssonicbld
force-pushed
the
sonicbld/202506-merge
branch
from
64ccf24 to
ffecf33
Compare
|
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. |
Signed-off-by: Austin Pham <austinpham@microsoft.com>
Signed-off-by: opcoder0 <110003254+opcoder0@users.noreply.github.com>
Collaborator
Author
|
/azp run |
mssonicbld
force-pushed
the
sonicbld/202506-merge
branch
from
ffecf33 to
fdc759d
Compare
|
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
fdc759d to
6113d69
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
6113d69 to
c0bd635
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
c0bd635 to
02c893d
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: --> Platforms can now configure thermal monitor intervals in their pmon_daemon_control.json: ``` # example { "thermalctld": { "thermal_monitor_initial_interval": 5, "thermal_monitor_update_interval": 30, "thermal_monitor_update_elapsed_threshold": 25 } } ``` Note this only affects the `ThermalMonitor` thread in the `thermalctld` daemon. `ThermalMonitor`'s role is to poll fan and temperature sensors from hardware and publish information to redis. This redis values are used in `show platform temperature` and `show platform fan` for example. Parameter Details `thermal_monitor_initial_interval` - Purpose: The initial time to wait before the first poll by `ThermalMonitor` on `thermalctld` startup. - Default: 5 seconds `thermal_monitor_update_interval` - Purpose: Every `thermal_monitor_update_interval` seconds, the hardware is polled - Default: 60 seconds `thermal_monitor_update_elapsed_threshold` - Purpose: If it takes longer than `thermal_monitor_update_elapsed_threshold` seconds to poll hardware (collected information from all fans and temperature sensors), a warning is logged. - Default: 30 seconds #### Why I did it The default polling interval of 60s is quite high and feels unresponsive (i.e. an operator can remove a fan and wait nearly a minute for `show plat fan` to update). #### How I did it In sonic-net/sonic-platform-daemons#635 we made these intervals configurable. This PR updates the jinja template to handle these new configuration options. It decreases the update interval from 60s -> 10s for NH-4010. I'm aiming for a balance of responsiveness without polling excessively. Example usage of these feature: https://github.com/nexthop-ai/private-sonic-buildimage/blob/master/device/nexthop/common/pmon_daemon_control.json #### How to verify it Verified on NH-4010 that `thermalctld` is being run with the expected options. <!-- 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 --> Signed-off-by: Sonic Build Admin <sonicbld@microsoft.com> #### A picture of a cute animal (not mandatory but encouraged)
Collaborator
Author
|
/azp run |
mssonicbld
force-pushed
the
sonicbld/202506-merge
branch
from
02c893d to
048250b
Compare
|
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
048250b to
ad8ff72
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. |
Signed-off-by: Yijing Yan <yijingyan@microsoft.com>
mssonicbld
force-pushed
the
sonicbld/202506-merge
branch
from
ad8ff72 to
dcc27bd
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. |
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
8 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.