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

Jump to bottom

[Mellanox] Remove pmon delay for certain platforms #19190

Merged
merged 2 commits into from
Jun 6, 2024
Merged

[Mellanox] Remove pmon delay for certain platforms #19190

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
2f0bb75
[nvidia] Remove pmon delay for certain platforms
stepanblyschak May 22, 2024
642d588
Remove xcvrd delay for SN4700 SKUs
stepanblyschak May 27, 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_msn4410-r0/pmon_daemon_control.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../x86_64-mlnx_msn2700-r0/pmon_daemon_control.json
../x86_64-mlnx_msn4700-r0/pmon_daemon_control.json
Empty file added device/mellanox/x86_64-mlnx_msn4410-r0/pmon_immediate_start
View file
Open in desktop
Empty file.
2 changes: 1 addition & 1 deletion device/mellanox/x86_64-mlnx_msn4600-r0/pmon_daemon_control.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../x86_64-mlnx_msn2700-r0/pmon_daemon_control.json
../x86_64-mlnx_msn4700-r0/pmon_daemon_control.json
Empty file added device/mellanox/x86_64-mlnx_msn4600-r0/pmon_immediate_start
View file
Open in desktop
Empty file.
2 changes: 1 addition & 1 deletion device/mellanox/x86_64-mlnx_msn4600c-r0/pmon_daemon_control.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../x86_64-mlnx_msn2700-r0/pmon_daemon_control.json
../x86_64-mlnx_msn4700-r0/pmon_daemon_control.json
Empty file added device/mellanox/x86_64-mlnx_msn4600c-r0/pmon_immediate_start
View file
Open in desktop
Empty file.
2 changes: 1 addition & 1 deletion device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-O8C48/pmon_daemon_control.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"skip_ledd": true,
"skip_fancontrol": true,
"delay_xcvrd": true,
"delay_xcvrd": false,
"skip_xcvrd_cmis_mgr": false
}
2 changes: 1 addition & 1 deletion device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-O8V48/pmon_daemon_control.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"skip_ledd": true,
"skip_fancontrol": true,
"delay_xcvrd": true,
"delay_xcvrd": false,
"skip_xcvrd_cmis_mgr": false
}
1 change: 0 additions & 1 deletion device/mellanox/x86_64-mlnx_msn4700-r0/pmon_daemon_control.json
View file
Open in desktop

This file was deleted.

6 changes: 6 additions & 0 deletions device/mellanox/x86_64-mlnx_msn4700-r0/pmon_daemon_control.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"skip_ledd": true,
"skip_fancontrol": true,
"skip_xcvrd_cmis_mgr": true
}

Empty file added device/mellanox/x86_64-mlnx_msn4700-r0/pmon_immediate_start
View file
Open in desktop
Empty file.
Empty file added device/mellanox/x86_64-mlnx_msn4700_simx-r0/pmon_immediate_start
View file
Open in desktop
Empty file.
5 changes: 0 additions & 5 deletions device/mellanox/x86_64-nvidia_sn4280_simx-r0/pmon_daemon_control.json
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions device/mellanox/x86_64-nvidia_sn4280_simx-r0/pmon_daemon_control.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../x86_64-mlnx_msn4700-r0/pmon_daemon_control.json
Empty file added device/mellanox/x86_64-nvidia_sn4280_simx-r0/pmon_immediate_start
View file
Open in desktop
Empty file.
2 changes: 1 addition & 1 deletion device/mellanox/x86_64-nvidia_sn4800-r0/pmon_daemon_control.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../x86_64-mlnx_msn2700-r0/pmon_daemon_control.json
../x86_64-mlnx_msn4700-r0/pmon_daemon_control.json
Empty file added device/mellanox/x86_64-nvidia_sn4800-r0/pmon_immediate_start
View file
Open in desktop
Empty file.
2 changes: 1 addition & 1 deletion device/mellanox/x86_64-nvidia_sn4800_simx-r0/pmon_daemon_control.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../x86_64-mlnx_msn2700_simx-r0/pmon_daemon_control.json
../x86_64-mlnx_msn4700-r0/pmon_daemon_control.json
Empty file added device/mellanox/x86_64-nvidia_sn4800_simx-r0/pmon_immediate_start
View file
Open in desktop
Empty file.
2 changes: 1 addition & 1 deletion device/mellanox/x86_64-nvidia_sn5400-r0/pmon_daemon_control.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../x86_64-mlnx_msn2700-r0/pmon_daemon_control.json
../x86_64-nvidia_sn5600-r0/pmon_daemon_control.json
Empty file added device/mellanox/x86_64-nvidia_sn5400-r0/pmon_immediate_start
View file
Open in desktop
Empty file.
2 changes: 1 addition & 1 deletion device/mellanox/x86_64-nvidia_sn5400_simx-r0/pmon_daemon_control.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
../x86_64-mlnx_msn2700-r0/pmon_daemon_control.json
../x86_64-nvidia_sn5600-r0/pmon_daemon_control.json
Empty file added device/mellanox/x86_64-nvidia_sn5400_simx-r0/pmon_immediate_start
View file
Open in desktop
Empty file.
1 change: 0 additions & 1 deletion device/mellanox/x86_64-nvidia_sn5600-r0/pmon_daemon_control.json
View file
Open in desktop

This file was deleted.

6 changes: 6 additions & 0 deletions device/mellanox/x86_64-nvidia_sn5600-r0/pmon_daemon_control.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"skip_ledd": true,
"skip_fancontrol": true,
"skip_xcvrd_cmis_mgr": true
}

Empty file added device/mellanox/x86_64-nvidia_sn5600-r0/pmon_immediate_start
View file
Open in desktop
Empty file.
Empty file added device/mellanox/x86_64-nvidia_sn5600_simx-r0/pmon_immediate_start
View file
Open in desktop
Empty file.
13 changes: 5 additions & 8 deletions files/scripts/syncd.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ function startplatform() {
platform=$aboot_platform
elif [ -n "$onie_platform" ]; then
platform=$onie_platform
else
else
platform="unknown"
fi
if [[ x"$platform" == x"x86_64-arista_720dt_48s" ]]; then
Expand Down Expand Up @@ -96,13 +96,10 @@ 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
PLATFORM=`$SONIC_DB_CLI CONFIG_DB hget 'DEVICE_METADATA|localhost' platform`
PMON_IMMEDIATE_START="/usr/share/sonic/device/$PLATFORM/pmon_immediate_start"
if [[ x"$BOOT_TYPE" = @(x"fast"|x"warm"|x"fastfast") ]] && [[ ! -f $PMON_IMMEDIATE_START ]]; then
debug "PMON service is delayed by for better fast/warm boot performance"
else
debug "Starting pmon service..."
/bin/systemctl start pmon
Expand Down
Loading