matthew/sonic-buildimage
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[PMON] Extend pmon daemon start control to lm-sensors and fancontrol for 201911 (#4487)

Browse Source 
Extend the PMON daemon start control to lm-sensors and fancontrol.

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)
This commit is contained in:
Kebo Liu 2020-04-29 04:39:10 +03:00 committed by GitHub
parent 827aab79d5
commit e12d2e8bee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
device/mellanox/x86_64-mlnx_msn2700-r0/pmon_daemon_control.json
View File

@ -1,4 +1,5 @@
{
"skip_ledd": true
"skip_ledd": true,
"skip_fancontrol": true
}

4
dockers/docker-platform-monitor/docker-pmon.supervisord.conf.j2
View File

@ -26,6 +26,7 @@ autorestart=false
stdout_logfile=syslog
stderr_logfile=syslog
{% if not skip_sensors %}
[program:lm-sensors]
command=/usr/bin/lm-sensors.sh
priority=3
@ -34,7 +35,9 @@ autorestart=false
stdout_logfile=syslog
stderr_logfile=syslog
startsecs=0
{% endif %}
{% if not skip_fancontrol %}
[program:fancontrol]
command=/usr/sbin/fancontrol
priority=4
@ -43,6 +46,7 @@ autorestart=unexpected
stdout_logfile=syslog
stderr_logfile=syslog
startsecs=10
{% endif %}
{% if not skip_ledd %}
[program:ledd]

4
dockers/docker-platform-monitor/start.sh.j2
View File

@ -19,6 +19,7 @@ if [ -e /usr/share/sonic/platform/platform_wait ]; then
fi
fi
{% if not skip_sensors %}
# If this platform has an lm-sensors config file, copy it to it's proper place
# and start lm-sensors
if [ -e /usr/share/sonic/platform/sensors.conf ]; then
@ -26,7 +27,9 @@ if [ -e /usr/share/sonic/platform/sensors.conf ]; then
/bin/cp -f /usr/share/sonic/platform/sensors.conf /etc/sensors.d/
supervisorctl start lm-sensors
fi
{% endif %}
{% if not skip_fancontrol %}
# If this platform has a fancontrol config file, copy it to it's proper place
# and start fancontrol
if [ -e /usr/share/sonic/platform/fancontrol ]; then
@ -36,6 +39,7 @@ if [ -e /usr/share/sonic/platform/fancontrol ]; then
/bin/cp -f /usr/share/sonic/platform/fancontrol /etc/
supervisorctl start fancontrol
fi
{% endif %}
# If the sonic-platform package is not installed, try to install it