Skip to content

Commit 6968aaa

Browse files
stepanblyschakstepanblyschak
authored
[Mellanox] Remove pmon delay for certain platforms (#19190)
* [nvidia] Remove pmon delay for certain platforms Signed-off-by: Stepan Blyschak <[email protected]>
1 parent 17f3d7d commit 6968aaa

File tree

25 files changed

+27
-24
lines changed

25 files changed

+27
-24
lines changed

‎device/mellanox/x86_64-mlnx_msn4410-r0/pmon_daemon_control.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../x86_64-mlnx_msn2700-r0/pmon_daemon_control.json
1+
../x86_64-mlnx_msn4700-r0/pmon_daemon_control.json

‎device/mellanox/x86_64-mlnx_msn4410-r0/pmon_immediate_start

Whitespace-only changes.

‎device/mellanox/x86_64-mlnx_msn4600-r0/pmon_daemon_control.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../x86_64-mlnx_msn2700-r0/pmon_daemon_control.json
1+
../x86_64-mlnx_msn4700-r0/pmon_daemon_control.json

‎device/mellanox/x86_64-mlnx_msn4600-r0/pmon_immediate_start

Whitespace-only changes.

‎device/mellanox/x86_64-mlnx_msn4600c-r0/pmon_daemon_control.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../x86_64-mlnx_msn2700-r0/pmon_daemon_control.json
1+
../x86_64-mlnx_msn4700-r0/pmon_daemon_control.json

‎device/mellanox/x86_64-mlnx_msn4600c-r0/pmon_immediate_start

Whitespace-only changes.

‎device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-O8C48/pmon_daemon_control.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"skip_ledd": true,
33
"skip_fancontrol": true,
4-
"delay_xcvrd": true,
4+
"delay_xcvrd": false,
55
"skip_xcvrd_cmis_mgr": false
66
}

‎device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-O8V48/pmon_daemon_control.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"skip_ledd": true,
33
"skip_fancontrol": true,
4-
"delay_xcvrd": true,
4+
"delay_xcvrd": false,
55
"skip_xcvrd_cmis_mgr": false
66
}

‎device/mellanox/x86_64-mlnx_msn4700-r0/pmon_daemon_control.json

-1
This file was deleted.

‎device/mellanox/x86_64-mlnx_msn4700-r0/pmon_daemon_control.json

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"skip_ledd": true,
3+
"skip_fancontrol": true,
4+
"skip_xcvrd_cmis_mgr": true
5+
}
6+

‎device/mellanox/x86_64-mlnx_msn4700-r0/pmon_immediate_start

Whitespace-only changes.

‎device/mellanox/x86_64-mlnx_msn4700_simx-r0/pmon_immediate_start

Whitespace-only changes.

‎device/mellanox/x86_64-nvidia_sn4280_simx-r0/pmon_daemon_control.json

-5
This file was deleted.

‎device/mellanox/x86_64-nvidia_sn4280_simx-r0/pmon_daemon_control.json

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../x86_64-mlnx_msn4700-r0/pmon_daemon_control.json

‎device/mellanox/x86_64-nvidia_sn4280_simx-r0/pmon_immediate_start

Whitespace-only changes.

‎device/mellanox/x86_64-nvidia_sn4800-r0/pmon_daemon_control.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../x86_64-mlnx_msn2700-r0/pmon_daemon_control.json
1+
../x86_64-mlnx_msn4700-r0/pmon_daemon_control.json

‎device/mellanox/x86_64-nvidia_sn4800-r0/pmon_immediate_start

Whitespace-only changes.

‎device/mellanox/x86_64-nvidia_sn4800_simx-r0/pmon_daemon_control.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../x86_64-mlnx_msn2700_simx-r0/pmon_daemon_control.json
1+
../x86_64-mlnx_msn4700-r0/pmon_daemon_control.json

‎device/mellanox/x86_64-nvidia_sn4800_simx-r0/pmon_immediate_start

Whitespace-only changes.

‎device/mellanox/x86_64-nvidia_sn5400-r0/pmon_daemon_control.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../x86_64-mlnx_msn2700-r0/pmon_daemon_control.json
1+
../x86_64-nvidia_sn5600-r0/pmon_daemon_control.json

‎device/mellanox/x86_64-nvidia_sn5400-r0/pmon_immediate_start

Whitespace-only changes.

‎device/mellanox/x86_64-nvidia_sn5400_simx-r0/pmon_daemon_control.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../x86_64-mlnx_msn2700-r0/pmon_daemon_control.json
1+
../x86_64-nvidia_sn5600-r0/pmon_daemon_control.json

‎device/mellanox/x86_64-nvidia_sn5400_simx-r0/pmon_immediate_start

Whitespace-only changes.

‎device/mellanox/x86_64-nvidia_sn5600-r0/pmon_daemon_control.json

-1
This file was deleted.

‎device/mellanox/x86_64-nvidia_sn5600-r0/pmon_daemon_control.json

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"skip_ledd": true,
3+
"skip_fancontrol": true,
4+
"skip_xcvrd_cmis_mgr": true
5+
}
6+

‎device/mellanox/x86_64-nvidia_sn5600-r0/pmon_immediate_start

Whitespace-only changes.

‎device/mellanox/x86_64-nvidia_sn5600_simx-r0/pmon_immediate_start

Whitespace-only changes.

‎files/scripts/syncd.sh

+5-8
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ function startplatform() {
5757
platform=$aboot_platform
5858
elif [ -n "$onie_platform" ]; then
5959
platform=$onie_platform
60-
else
60+
else
6161
platform="unknown"
6262
fi
6363
if [[ x"$platform" == x"x86_64-arista_720dt_48s" ]]; then
@@ -96,13 +96,10 @@ function waitplatform() {
9696

9797
BOOT_TYPE=`getBootType`
9898
if [[ x"$sonic_asic_platform" == x"mellanox" ]]; then
99-
if [[ x"$BOOT_TYPE" = @(x"fast"|x"warm"|x"fastfast") ]]; then
100-
PMON_TIMER_STATUS=$(systemctl is-active pmon.timer)
101-
if [[ x"$PMON_TIMER_STATUS" = x"inactive" ]]; then
102-
systemctl start pmon.timer
103-
else
104-
debug "PMON service is delayed by a timer for better fast/warm boot performance"
105-
fi
99+
PLATFORM=`$SONIC_DB_CLI CONFIG_DB hget 'DEVICE_METADATA|localhost' platform`
100+
PMON_IMMEDIATE_START="/usr/share/sonic/device/$PLATFORM/pmon_immediate_start"
101+
if [[ x"$BOOT_TYPE" = @(x"fast"|x"warm"|x"fastfast") ]] && [[ ! -f $PMON_IMMEDIATE_START ]]; then
102+
debug "PMON service is delayed by for better fast/warm boot performance"
106103
else
107104
debug "Starting pmon service..."
108105
/bin/systemctl start pmon

0 commit comments

Comments
 (0)