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

[PMON] Extend pmon daemon start control to lm-sensors and fancontrol #4447

Merged
merged 2 commits into from
Apr 21, 2020
Merged

[PMON] Extend pmon daemon start control to lm-sensors and fancontrol #4447

merged 2 commits into from
Apr 21, 2020

Conversation

keboliu
Copy link
Collaborator

@keboliu keboliu commented Apr 20, 2020

- What I did
Extend the PMON daemon start control to lm-sensors and fancontrol.

- How I did it
change template docker-pmon.supervisord.conf.j2 and start.sh.j2 to have lm-sensors and fancontrol start scripts and supervisord config file controlled by pmon_daemon_control.json.

the intention is to avoid wrong daemon status in "supervisorctl status" output. For example, on some platform, if there is no fancontrol config file, and it is not ruled out from supervisord conf file and start.sh, we'll see fancontrol in "STOPPED" status from "supervisorctl status" output, which will violate some check in the platform test(check daemon status as expected)

- How to verify it
check "supervisorctl status" inside PMON

- Description for the changelog

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

@jleveque
Copy link
Contributor

Retest vsimage please

@jleveque jleveque merged commit 860cb26 into sonic-net:master Apr 21, 2020
@stephenxs
Copy link
Collaborator

Hi Joe,
Could you please cherry pick it to 201911 as well?
Thank you

@jleveque
Copy link
Contributor

@stephenxs: Kebo added the label; @abdosi will cherry pick at his next convenience.

@stephenxs
Copy link
Collaborator

Got it. Thanks.

@abdosi
Copy link
Contributor

abdosi commented Apr 27, 2020

@stephenxs @keboliu

Please create PR for 201911. There are some conflicts

cc @jleveque

@keboliu
Copy link
Collaborator Author

keboliu commented Apr 28, 2020

@abdosi please check #4487

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.

5 participants