Skip to content

Delay pmon non-critical daemon #18907

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

Merged
liat-grozovik merged 2 commits into from
Nov 20, 2024
Merged

Delay pmon non-critical daemon #18907

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
761309d
Delay pmon non-critical daemon
yuazhe Apr 2, 2024
16f1f98
Merge branch 'master' into pmon_delay
yuazhe Oct 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion device/mellanox/x86_64-mlnx_msn2700-r0/pmon_daemon_control.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"skip_ledd": true,
"skip_fancontrol": true,
"delay_xcvrd": true,
"skip_xcvrd_cmis_mgr": true
"skip_xcvrd_cmis_mgr": true,
"delay_non_critical_daemon": true
}

7 changes: 7 additions & 0 deletions dockers/docker-platform-monitor/delay.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#!/usr/bin/env python3

# This file serves as a monitor for advanced reboot.
# Once it exits, the delayed daemon will initiate.

from swsscommon.swsscommon import RestartWaiter
RestartWaiter.waitAdvancedBootDone()
22 changes: 16 additions & 6 deletions dockers/docker-platform-monitor/docker-pmon.supervisord.conf.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,16 @@ stdout_logfile=syslog
stderr_logfile=syslog
dependent_startup=true


{% if delay_non_critical_daemon %}
[program:delay]
command=python3 /usr/bin/delay.py
autostart=false
autorestart=false
startsecs=0
dependent_startup=true
{% endif %}

{% if not skip_chassisd and (IS_MODULAR_CHASSIS == 1 or is_smartswitch) %}
[program:chassisd]
command=/usr/local/bin/chassisd
Expand Down Expand Up @@ -64,7 +74,7 @@ stdout_logfile=syslog
stderr_logfile=syslog
startsecs=0
dependent_startup=true
dependent_startup_wait_for=rsyslogd:running
dependent_startup_wait_for=rsyslogd:running {% if delay_non_critical_daemon %}delay:exited{% endif %}
{% endif %}

{% if not skip_fancontrol and HAVE_FANCONTROL_CONF == 1 %}
Expand Down Expand Up @@ -151,7 +161,7 @@ stdout_logfile=syslog
stderr_logfile=syslog
startsecs=10
dependent_startup=true
dependent_startup_wait_for=rsyslogd:running
dependent_startup_wait_for=rsyslogd:running {% if delay_non_critical_daemon %}delay:exited{% endif %}
{% endif %}

{% if not skip_syseepromd %}
Expand All @@ -164,7 +174,7 @@ stdout_logfile=syslog
stderr_logfile=syslog
startsecs=10
dependent_startup=true
dependent_startup_wait_for=rsyslogd:running
dependent_startup_wait_for=rsyslogd:running {% if delay_non_critical_daemon %}delay:exited{% endif %}
{% endif %}

{% if not skip_thermalctld %}
Expand All @@ -178,7 +188,7 @@ stderr_logfile=syslog
startsecs=10
startretries=50
dependent_startup=true
dependent_startup_wait_for=rsyslogd:running
dependent_startup_wait_for=rsyslogd:running {% if delay_non_critical_daemon %}delay:exited{% endif %}
{% endif %}

{% if not skip_pcied %}
Expand All @@ -191,7 +201,7 @@ stdout_logfile=syslog
stderr_logfile=syslog
startsecs=10
dependent_startup=true
dependent_startup_wait_for=rsyslogd:running
dependent_startup_wait_for=rsyslogd:running {% if delay_non_critical_daemon %}delay:exited{% endif %}
{% endif %}

{% if include_sensormond %}
Expand All @@ -204,7 +214,7 @@ stdout_logfile=syslog
stderr_logfile=syslog
startsecs=10
dependent_startup=true
dependent_startup_wait_for=rsyslogd:running
dependent_startup_wait_for=rsyslogd:running {% if delay_non_critical_daemon %}delay:exited{% endif %}
{% endif %}

{% if not skip_stormond %}
Expand Down