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.

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

Add thermal control support for SONiC #3949

Merged
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
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
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
… unsupported and treat 0.0 as N/A in high_threshold in xsfp module
@msftclas
Copy link

msftclas commented Dec 27, 2019

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
@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

@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
abdosi pushed a commit that referenced this pull request May 1, 2020
nazariig added a commit to nazariig/sonic-buildimage that referenced this pull request May 4, 2020
This reverts commit 109a13c.

Conflicts:
	dockers/docker-platform-monitor/docker-pmon.supervisord.conf.j2
liat-grozovik pushed a commit that referenced this pull request May 4, 2020
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
 * 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
* Add thermalctl to pmon docker
 * Still use original commit message for reference

Co-authored-by: Junchao-Mellanox <57339448+Junchao-Mellanox@users.noreply.github.com>
Junchao-Mellanox added a commit to Junchao-Mellanox/sonic-buildimage that referenced this pull request Jun 1, 2020
Conflicts:
	src/sonic-platform-common
	src/sonic-platform-daemons
@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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants