From b6ce71b87a7fabae32a01ed82133c9cee9554b91 Mon Sep 17 00:00:00 2001 From: vadymhlushko-mlnx Date: Fri, 23 Feb 2024 15:10:09 +0200 Subject: [PATCH] Remove the PMON and XCVRD delay on system boot Signed-off-by: vadymhlushko-mlnx --- .../pmon_daemon_control.json | 2 +- files/build_templates/init_cfg.json.j2 | 2 +- files/scripts/syncd.sh | 15 +++------------ 3 files changed, 5 insertions(+), 14 deletions(-) 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 dbc19c9baa..107e788d41 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,7 +1,7 @@ { "skip_ledd": true, "skip_fancontrol": true, - "delay_xcvrd": true, + "delay_xcvrd": false, "skip_xcvrd_cmis_mgr": true } diff --git a/files/build_templates/init_cfg.json.j2 b/files/build_templates/init_cfg.json.j2 index 9c02de6020..89d46876b0 100644 --- a/files/build_templates/init_cfg.json.j2 +++ b/files/build_templates/init_cfg.json.j2 @@ -36,7 +36,7 @@ {%- set features = [("bgp", "{% if not DEVICE_RUNTIME_METADATA['ETHERNET_PORTS_PRESENT'] or ('CHASSIS_METADATA' in DEVICE_RUNTIME_METADATA and DEVICE_RUNTIME_METADATA['CHASSIS_METADATA']['module_type'] in ['supervisor']) %}disabled{% else %}enabled{% endif %}", false, "enabled"), ("database", "always_enabled", false, "always_enabled"), ("lldp", "enabled", true, "enabled"), - ("pmon", "enabled", true, "enabled"), + ("pmon", "enabled", false, "enabled"), ("snmp", "enabled", true, "enabled"), ("swss", "enabled", false, "enabled"), ("syncd", "enabled", false, "enabled")] %} diff --git a/files/scripts/syncd.sh b/files/scripts/syncd.sh index e9c2cfd494..2c1719dd72 100755 --- a/files/scripts/syncd.sh +++ b/files/scripts/syncd.sh @@ -92,18 +92,9 @@ function waitplatform() { BOOT_TYPE=`getBootType` if [[ x"$sonic_asic_platform" == x"mellanox" ]]; then - if [[ x"$BOOT_TYPE" = @(x"fast"|x"warm"|x"fastfast") ]]; then - PMON_TIMER_STATUS=$(systemctl is-active pmon.timer) - if [[ x"$PMON_TIMER_STATUS" = x"inactive" ]]; then - systemctl start pmon.timer - else - debug "PMON service is delayed by a timer for better fast/warm boot performance" - fi - else - debug "Starting pmon service..." - /bin/systemctl start pmon - debug "Started pmon service" - fi + debug "Starting pmon service..." + /bin/systemctl start pmon + debug "Started pmon service" fi }