[201911][thermal control] Backport feature from master branch #4677
Conversation
This file contains 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
Conflicts: src/sonic-platform-common src/sonic-platform-daemons
* [thermal control] Fix pmon docker stop issue on 3800 * [thermal fix] Fix QA test issue * [thermal fix] change psu._get_power_available_status to psu.get_power_available_status * [thermal fix] adjust log for PSU absence and power absence * [thermal fix] add unit test for loading thermal policy file with duplicate conditions in different policies * [thermal] fix fan.get_presence for non-removable SKU * [thermal fix] fix issue: fan direction is based on drawer * Fix issue: when fan is not present, should not read fan direction from sysfs but directly return N/A * [thermal fix] add unit test for get_direction for absent FAN * Unplugable PSU has no FAN, no need add a FAN object for this PSU * Update submodules Co-authored-by: Stephen Sun <5379172+stephenxs@users.noreply.github.com> Conflicts: platform/mellanox/mlnx-platform-api/sonic_platform/chassis.py platform/mellanox/mlnx-platform-api/sonic_platform/fan.py platform/mellanox/mlnx-platform-api/sonic_platform/psu.py platform/mellanox/mlnx-platform-api/sonic_platform/thermal.py src/sonic-platform-common src/sonic-platform-daemons
…and PSU fan speed policy (sonic-net#4403) Conflicts: platform/mellanox/mlnx-platform-api/sonic_platform/fan.py
* remove air flow direction from dynamic minimum algorithm * adjust minimum table according to thermal data
…#4631) * Trigger thermal action log only if thermal condition changes * test file existence before read file content * fix error for set psu fan speed * Remove logs because it print too frequently
…hm issue on SN4700
|
Depends on sonic-net/sonic-platform-common#90, neew merge sonic-net/sonic-platform-common#90 first and update submodule pointer to make build success. |
|
Depend on sonic-net/sonic-utilities#929 |
|
This pull request introduces 10 alerts when merging c8beb14 into 007eeec - view on LGTM.com new alerts:
|
|
Can you provide a reference to master PR? |
|
This pull request introduces 8 alerts when merging 3951ff6 into 007eeec - view on LGTM.com new alerts:
|
For the 5 wrong number of arguments in a class instantiation, it's not an issue. Instead, I create a issue for LGTM github/codeql#3617. |
|
This pull request introduces 8 alerts when merging 6da400d into 007eeec - view on LGTM.com new alerts:
|
jleveque
changed the title
jleveque
changed the title
|
Can you resolve conflict? |
|
Resolved |
|
This pull request introduces 8 alerts when merging 1b01d5d into e73a5f1 - view on LGTM.com new alerts:
|
|
Retest this please |
jleveque
approved these changes
Jun 8, 2020
Closed
# for free
to join this conversation on GitHub.
Already have an account?
# to comment
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.
- Why I did it
There are a few PRs related to thermal control feature and auto merge doesn't work, so I created a pull request to integrate those PRs to 201911.
- How I did it
Cherry-pick all realted PRs to 201911 branch and fix all conflict manually.
- How to verify it
Manual test on SN2700, SN3800 and SN4700.
- Description for the changelog
- A picture of a cute animal (not mandatory but encouraged)