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.

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

Remove PMON and XCVRD delay on system boot for modules controlled by SW #18295

Closed
wants to merge 2 commits into from
Closed

Remove PMON and XCVRD delay on system boot for modules controlled by SW #18295

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
c118b2a
Remove the PMON and XCVRD delay on system boot
vadymhlushko-mlnx Feb 23, 2024
c400723
Remove waitplatform() from syncd.sh
vadymhlushko-mlnx May 14, 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
2 changes: 1 addition & 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
@@ -1,7 +1,7 @@
{
"skip_ledd": true,
"skip_fancontrol": true,
"delay_xcvrd": true,
"delay_xcvrd": false,
"skip_xcvrd_cmis_mgr": true
}

2 changes: 1 addition & 1 deletion files/build_templates/init_cfg.json.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")] %}
Expand Down
4 changes: 0 additions & 4 deletions files/scripts/gbsyncd.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,6 @@ function startplatform() {
done
}

function waitplatform() {
:
}

function stopplatform1() {
if ! docker top gbsyncd$DEV | grep -q /usr/bin/syncd; then
debug "syncd process in container gbsyncd$DEV is not running"
Expand Down
19 changes: 0 additions & 19 deletions files/scripts/syncd.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,25 +92,6 @@ function startplatform() {
fi
}

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
fi
}

function stopplatform1() {

if [[ x$sonic_asic_platform == x"mellanox" ]] && [[ x$TYPE == x"cold" ]]; then
Expand Down
3 changes: 0 additions & 3 deletions files/scripts/syncd_common.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
# scripts using this must provide implementations of the following functions:
#
# startplatform
# waitplatform
# stopplatform1 and stopplatform2
#
# For examples of these, see gbsyncd.sh and syncd.sh.
Expand Down Expand Up @@ -141,8 +140,6 @@ wait() {
fi
fi

waitplatform

/usr/bin/${SERVICE}.sh wait $DEV
}

Expand Down
Loading