[202608] code sync from sonic-platform-daemons 202605 to sonic-platform-daemons.msft 202608 - #85
Merged
Merged
Conversation
…Host --> BMC (#885) #### Why I did it Bmcctld improvements & thermalctld: push thermals from Switch-Host --> BMC ##### Work item tracking - Microsoft ADO **(number only)**: N/A #### How I did it **sonic-bmcctld/scripts/bmcctld** - Conditional SWITCH_HOST_POWER_ON_DELAY - applied only on REBOOT_CAUSE_POWER_LOSS; skipped on warm/fast/soft reboot. - GracefulShutdownHandler.execute() cleaned up - Event-log de-duplication across handler functions - Rack manager alert : skip when incoming alert matches to existing alert level, prevents unnecessary pub/sub events - chassis module admin_status : skip when admin_status don't change, prevents unnecessary pub/sub events - Uses self.chassis.is_liquid_cooled() platform API. - Update the init_host_state API to derive the device_power_state from get_oper_status platform API which will either ONLINE/OFFLINE. - Set the default graceful_shutdown_timeout = 0 till we support GNOI graceful shutdown **sonic-thermalctld/scripts/thermalctld** - EventLogger class added - stores critical events to syslog and /host/bmc/event.log. - Switch-Host ↔ BMC, thermals are pushed to BMC, via TEMPERATURE_INFO_STATE_DB table - critical temperature breaches logged into BMC event log. - LiquidCoolingUpdater improvements: - writes SYSTEM_LEAK_STATUS only on transitions - Per-sensor state updates also only on transitions - Added the Leak severity escalation logic (MINOR → CRITICAL after max_minor_duration_sec). - Critical leaks logged via event_logger. - Add logic to use self.chassis.is_liquid_cooled() also to identify liquid cooled platforms" #### How to verify it All Unit tests pass and sonic-mgmt tests for bmcctld and thermalctld pass #### Which release branch to backport (provide reason below if selected) - [ ] 201811 - [ ] 201911 - [ ] 202012 - [ ] 202106 - [ ] 202111 - [ ] 202205 - [ ] 202211 - [ ] 202305 - [ ] 202311 - [ ] 202405 - [ ] 202411 - [ ] 202505 - [ ] 202511 - [x] 202605 Signed-off-by: Sonic Build Admin <sonicbld@microsoft.com>
…s.msft 202608 Signed-off-by: Yijing Yan <yijingyan@microsoft.com>
|
Azure Pipelines: There may be pipelines that require an authorized user to comment /azp run to run. |
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
3 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.
Description
Synchronize the upstream
sonic-platform-daemons202605branch intosonic-platform-daemons.msft202608at upstream commitca27813.The synchronized upstream change covers BMC platform monitoring improvements:
bmcctld.thermalctld.The functional content of upstream commit
ca27813was already ported to the Microsoft branch by #70, with follow-up fixes in #71, #72, #73, and #83. Conflict resolution therefore preserves the newer Microsoft follow-up behavior. The resulting merge has no net file changes against the current202608branch and primarily establishes a common ancestry/synchronization point.Motivation and Context
Keep
sonic-platform-daemons.msft/202608synchronized withsonic-platform-daemons/202605, record the upstream merge point, and reduce conflicts in subsequent code-sync merges without regressing Microsoft-specific follow-up fixes.How Has This Been Tested?
python3 -m py_compile.202608branch.bmcctldandthermalctldpytest suites locally; collection requires SONiC runtime packages (sonic_platform_baseandsonic_py_common) that are not installed in the standalone development environment.Additional Information (Optional)
sonic-net/sonic-platform-daemons:202605ca27813([PMON] Bmcctld improvements & thermalctld: push thermals from Switch-Host --> BMC)Azure/sonic-platform-daemons.msft:202608