From e61421beae90de99f38cfac7379eb605a6ff86bb Mon Sep 17 00:00:00 2001 From: junchao Date: Tue, 13 Oct 2020 11:35:57 +0800 Subject: [PATCH] Add a configuration to delay start xcvrd for fast-reboot --- .../mellanox/x86_64-mlnx_msn2700-r0/pmon_daemon_control.json | 3 ++- .../docker-platform-monitor/docker-pmon.supervisord.conf.j2 | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/device/mellanox/x86_64-mlnx_msn2700-r0/pmon_daemon_control.json b/device/mellanox/x86_64-mlnx_msn2700-r0/pmon_daemon_control.json index d12b2100eea8..86910af29e89 100644 --- a/device/mellanox/x86_64-mlnx_msn2700-r0/pmon_daemon_control.json +++ b/device/mellanox/x86_64-mlnx_msn2700-r0/pmon_daemon_control.json @@ -1,5 +1,6 @@ { "skip_ledd": true, - "skip_fancontrol": true + "skip_fancontrol": true, + "delay_xcvrd": true } diff --git a/dockers/docker-platform-monitor/docker-pmon.supervisord.conf.j2 b/dockers/docker-platform-monitor/docker-pmon.supervisord.conf.j2 index f1eacf5b408c..7bf5eade6122 100644 --- a/dockers/docker-platform-monitor/docker-pmon.supervisord.conf.j2 +++ b/dockers/docker-platform-monitor/docker-pmon.supervisord.conf.j2 @@ -79,7 +79,11 @@ dependent_startup_wait_for=start:exited {% if not skip_xcvrd %} [program:xcvrd] +{% if delay_xcvrd %} +command=bash -c "sleep 30 && /usr/local/bin/xcvrd" +{% else %} command=/usr/local/bin/xcvrd +{% endif %} priority=6 autostart=false autorestart=false