Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add thermal control support for SONiC #3949

Merged
merged 40 commits into from
Mar 9, 2020
Merged

Add thermal control support for SONiC #3949

merged 40 commits into from
Mar 9, 2020

Conversation

Junchao-Mellanox
Copy link
Collaborator

- What I did

  1. Add thermal control policy files and soft links so that the policy configuration file will be automatically copied to pmon docker.
  2. Add a new make rule to build thermal control daemon.
  3. Change a few make rules to support unit test for mellanox platform API and thermal control daemon.
  4. Provide default thermal policy implementation in mellanox platform API.
  5. Add unit test cases for thermal policy in mellanox platform API. The major purpose is to increase our test coverage by cover some negative test cases.

- How I did it

- How to verify it
Issue command "make target/sonic-mellanox.bin", during make, the unit test cases are automatically run.
- Description for the changelog

- A picture of a cute animal (not mandatory but encouraged)

Junchao-Mellanox and others added 24 commits November 28, 2019 10:25
@Junchao-Mellanox
Add make support for thermal control feature
cf98224
[sonic_platform]fix issues found in thermal ctrl:
f428c1c 
1. thermals are not added to thermal list, cause: thermal initliazer not called
2. add fan of psu to fan list rather than to set it into _fan
@Junchao-Mellanox
[sonic_platform]fix issues found in thermal ctrl:
2b4089d 
1. thermals are not added to thermal list, cause: thermal initliazer not called
2. add fan of psu to fan list rather than to set it into _fan
[sonic_platform]add get_name for fan and psu
25a3aef
[sonic_platform]fix divide-by-zero error due to max speed for psu fan…
325840c 
… unsupported and treat 0.0 as N/A in high_threshold in xsfp module
[thermal.py]handle get_high_critical_threshold
952393f
@Junchao-Mellanox
Move task_base form sonic-platform-daemon to sonic-daemon-base so tha…
1d83717 
…t all sonic pmon daemon can use it
@Junchao-Mellanox
Merge branch 'thermal-control' of https://github.com/Junchao-Mellanox…
77a1d4b 
…/sonic-buildimage into thermal-control
@Junchao-Mellanox
Merge from stephen to fix thermal related issues
ff562c9
@Junchao-Mellanox
[fan.py]fix error in get_target_speed for PSU fan
6f1e2c3
@Junchao-Mellanox
Add thermal policy JSON file for mellanox devices
fa8273b
@Junchao-Mellanox
Fix issue found by manual test
aeee985
@Junchao-Mellanox
add default thermal control implementation to mellanox platform api a…
d27f67b 
…s well as the unit test
@Junchao-Mellanox
add unit test support for sonic thermalctld
5773bb2
@Junchao-Mellanox
rename some functions to make it more readable according to Kebo comm…
9772e30 
…ents
@Junchao-Mellanox
add check for speed value in thermal actions to avoid load invalid value
d4de5d8
@Junchao-Mellanox
add unit test to cover thermal conditions and actions
183a42b
@Junchao-Mellanox
Change according to stepan comment
27803f3
@Junchao-Mellanox
1. Add base class for FanConditions and PsuConditions; 2. Add default…
af996c7 
… chassis_info to policy file
@Junchao-Mellanox
remove thermalctld from critical_processes
704228c
@Junchao-Mellanox
add default thermal manager getter in chassis.py
3d9bf8a
@Junchao-Mellanox
add implementation for start and stop thermal algorithm
e479f4e
@Junchao-Mellanox
add unit test for thermal algorithm related JSON config
c865626
@Junchao-Mellanox
adjust thermal_policy.json to make it compatible with current platfor…
dcc232e 
…m test
@msftclas
Copy link

msftclas commented Dec 27, 2019 •
edited
Loading

CLA assistant check
All CLA requirements met.

@Junchao-Mellanox Junchao-Mellanox changed the title Thermal policy Add thermal control support for SONiC Dec 27, 2019
@Junchao-Mellanox Junchao-Mellanox marked this pull request as ready for review January 7, 2020 10:09
keboliu
keboliu previously approved these changes Jan 11, 2020
View reviewed changes
@Junchao-Mellanox
Copy link
Collaborator Author

I am not sure about that. @liat-grozovik can you answer the question?

@keboliu
Copy link
Collaborator

keboliu commented Mar 9, 2020

@jleveque all the dependencies of this PR is merged, so I think this one is also good to go. As for the 201911 branch, if we are allowed, of course, we want this thermal control feature to be there. Anyway, let have it in mater first:)

@jleveque
Copy link
Contributor

jleveque commented Mar 9, 2020

@keboliu: OK. Since this is a new feature, I am reluctant to cherry-pick into 201911, as it is a release branch. I will merge to master for now. If we deem it is stable and can be cherry-picked to 201911, I will ask you for a list of all relevant commits from all repos that will need to be cherry-picked, so please keep track, just in case.

@jleveque jleveque merged commit be549db into sonic-net:master Mar 9, 2020
@wendani
Copy link
Contributor

wendani commented Apr 17, 2020

request for 201911 @jleveque @abdosi together with sonic-net/sonic-platform-daemons#49 and sonic-net/sonic-platform-daemons#51

This was referenced Apr 17, 2020
Merged
Merged
@abdosi
Copy link
Contributor

abdosi commented Apr 17, 2020

@wendani please use label "Request for 201911 Branch" for all repos that way it will get tracked by default.

@jleveque
Copy link
Contributor

@wendani: Does you account not have the ability to add labels to PRs? If not, maybe we can look into changing permissions in order to allow it.

@wendani
Copy link
Contributor

wendani commented Apr 17, 2020

@jleveque I do not have permission to add labels

#3949 (comment)

pphuchar pushed a commit to pphuchar/sonic-buildimage that referenced this pull request Apr 20, 2020
@Junchao-Mellanox @pphuchar
Add thermal control support for SONiC (sonic-net#3949)
6466930
abdosi pushed a commit that referenced this pull request May 1, 2020
@Junchao-Mellanox @abdosi
Add thermal control support for SONiC (#3949)
109a13c
nazariig added a commit to nazariig/sonic-buildimage that referenced this pull request May 4, 2020
@nazariig
Revert "Add thermal control support for SONiC (sonic-net#3949)"
aec9ba3 
This reverts commit 109a13c.

Conflicts:
	dockers/docker-platform-monitor/docker-pmon.supervisord.conf.j2
@liat-grozovik liat-grozovik mentioned this pull request May 4, 2020
Merged
liat-grozovik pushed a commit that referenced this pull request May 4, 2020
@nazariig
Revert "Add thermal control support for SONiC (#3949)" (#4527)
c266435 
This reverts commit 109a13c.

Conflicts:
	dockers/docker-platform-monitor/docker-pmon.supervisord.conf.j2
pphuchar pushed a commit to pphuchar/sonic-buildimage that referenced this pull request May 15, 2020
@Junchao-Mellanox @pphuchar
Add thermal control support for SONiC (sonic-net#3949)
6a61d4a 
 * Add thermalctl to pmon docker
 * Still use original commit message for reference
bbinxie pushed a commit to SONIC-DEV/sonic-buildimage that referenced this pull request May 21, 2020
@pphuchar @Junchao-Mellanox
Add thermal control support for SONiC (sonic-net#3949) (#179)
84382d1 
* Add thermalctl to pmon docker
 * Still use original commit message for reference

Co-authored-by: Junchao-Mellanox <[email protected]>
Junchao-Mellanox added a commit to Junchao-Mellanox/sonic-buildimage that referenced this pull request Jun 1, 2020
@Junchao-Mellanox
Add thermal control support for SONiC (sonic-net#3949)
d8318ae 
Conflicts:
	src/sonic-platform-common
	src/sonic-platform-daemons
@Junchao-Mellanox Junchao-Mellanox mentioned this pull request Jun 4, 2020
Merged
@Junchao-Mellanox Junchao-Mellanox deleted the thermal-policy branch December 15, 2020 01:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jleveque jleveque jleveque approved these changes

@keboliu keboliu keboliu left review comments

@stepanblyschak stepanblyschak Awaiting requested review from stepanblyschak

Assignees
No one assigned
Labels
Enhancement ➕ Included in 201911 Branch Request for 201911 Branch :shipit: Submodule Update ⏫
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@Junchao-Mellanox @msftclas @liat-grozovik @jleveque @keboliu @wendani @abdosi