Skip to content

Commit

Permalink
Merge pull request sonic-net#125 from mssonicbld/sonicbld/202205-merge
Browse files Browse the repository at this point in the history 
[code sync] Merge code from sonic-net/sonic-buildimage:202205 to 202205
  • Loading branch information
@mssonicbld
mssonicbld authored Sep 29, 2023
2 parents 91cf371 + 201af08 commit 7993c57
Show file tree
Hide file tree
Showing 16 changed files with 24 additions and 1 deletion.
1 change: 1 addition & 0 deletions device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-C28D8/sai.profile
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_2700_8x50g_28x100g.xml
SAI_DUMP_STORE_PATH=/var/log/mellanox/sdk-dumps
SAI_DUMP_STORE_AMOUNT=10
SAI_DEFAULT_SWITCHING_MODE_STORE_FORWARD=1
1 change: 1 addition & 0 deletions device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D40C8S8/sai.profile
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_2700_8x100g_40x50g_8x10g.xml
SAI_DUMP_STORE_PATH=/var/log/mellanox/sdk-dumps
SAI_DUMP_STORE_AMOUNT=10
SAI_DEFAULT_SWITCHING_MODE_STORE_FORWARD=1
1 change: 1 addition & 0 deletions device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D44C10/sai.profile
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_2700_44x50g_10x100g.xml
SAI_DUMP_STORE_PATH=/var/log/mellanox/sdk-dumps
SAI_DUMP_STORE_AMOUNT=10
SAI_DEFAULT_SWITCHING_MODE_STORE_FORWARD=1
1 change: 1 addition & 0 deletions device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D48C8/sai.profile
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_2700_48x50g_8x100g.xml
SAI_DUMP_STORE_PATH=/var/log/mellanox/sdk-dumps
SAI_DUMP_STORE_AMOUNT=10
SAI_DEFAULT_SWITCHING_MODE_STORE_FORWARD=1
1 change: 0 additions & 1 deletion device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700/sai.profile
View file

This file was deleted.

4 changes: 4 additions & 0 deletions device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700/sai.profile
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_2700.xml
SAI_DUMP_STORE_PATH=/var/log/mellanox/sdk-dumps
SAI_DUMP_STORE_AMOUNT=10
SAI_DEFAULT_SWITCHING_MODE_STORE_FORWARD=1
1 change: 1 addition & 0 deletions device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-C64/sai.profile
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_3800.xml
SAI_DUMP_STORE_PATH=/var/log/mellanox/sdk-dumps
SAI_DUMP_STORE_AMOUNT=10
SAI_DEFAULT_SWITCHING_MODE_STORE_FORWARD=1
1 change: 1 addition & 0 deletions device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D100C12S2/sai.profile
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_3800_2x10g_100x50g_12x100g.xml
SAI_DUMP_STORE_PATH=/var/log/mellanox/sdk-dumps
SAI_DUMP_STORE_AMOUNT=10
SAI_DEFAULT_SWITCHING_MODE_STORE_FORWARD=1
1 change: 1 addition & 0 deletions device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D112C8/sai.profile
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_3800_112x50g_8x100g.xml
SAI_DUMP_STORE_PATH=/var/log/mellanox/sdk-dumps
SAI_DUMP_STORE_AMOUNT=10
SAI_DEFAULT_SWITCHING_MODE_STORE_FORWARD=1
1 change: 1 addition & 0 deletions device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D24C52/sai.profile
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_3800_24x50g_52x100g.xml
SAI_DUMP_STORE_PATH=/var/log/mellanox/sdk-dumps
SAI_DUMP_STORE_AMOUNT=10
SAI_DEFAULT_SWITCHING_MODE_STORE_FORWARD=1
1 change: 1 addition & 0 deletions device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D28C49S1/sai.profile
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_3800_1x10g_28x50g_49x100g.xml
SAI_DUMP_STORE_PATH=/var/log/mellanox/sdk-dumps
SAI_DUMP_STORE_AMOUNT=10
SAI_DEFAULT_SWITCHING_MODE_STORE_FORWARD=1
1 change: 1 addition & 0 deletions device/mellanox/x86_64-mlnx_msn3800-r0/Mellanox-SN3800-D28C50/sai.profile
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_3800_28x50g_52x100g.xml
SAI_DUMP_STORE_PATH=/var/log/mellanox/sdk-dumps
SAI_DUMP_STORE_AMOUNT=10
SAI_DEFAULT_SWITCHING_MODE_STORE_FORWARD=1
1 change: 1 addition & 0 deletions device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-C64/sai.profile
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_4600C.xml
SAI_DUMP_STORE_PATH=/var/log/mellanox/sdk-dumps
SAI_DUMP_STORE_AMOUNT=10
SAI_DEFAULT_SWITCHING_MODE_STORE_FORWARD=1
1 change: 1 addition & 0 deletions device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D100C12S2/sai.profile
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_4600c_100x50g_12x100g_2x10g.xml
SAI_DUMP_STORE_PATH=/var/log/mellanox/sdk-dumps
SAI_DUMP_STORE_AMOUNT=10
SAI_DEFAULT_SWITCHING_MODE_STORE_FORWARD=1
1 change: 1 addition & 0 deletions device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D112C8/sai.profile
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_4600c_112x50g_8x100g.xml
SAI_DUMP_STORE_PATH=/var/log/mellanox/sdk-dumps
SAI_DUMP_STORE_AMOUNT=10
SAI_DEFAULT_SWITCHING_MODE_STORE_FORWARD=1
1 change: 1 addition & 0 deletions device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D48C40/sai.profile
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_4600c_48x50g_40x100g.xml
SAI_DUMP_STORE_PATH=/var/log/mellanox/sdk-dumps
SAI_DUMP_STORE_AMOUNT=10
SAI_DEFAULT_SWITCHING_MODE_STORE_FORWARD=1
6 changes: 6 additions & 0 deletions files/build_templates/docker_image_ctl.j2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -241,6 +241,12 @@ function postStartAction()
$SONIC_CFGGEN -j /etc/sonic/config_db$DEV.json --write-to-db
fi
fi

if [[ "$BOOT_TYPE" == "fast" ]]; then
# this is the case when base OS version does not support fast-reboot with reconciliation logic (dump.rdb is absent)
# In this case, we need to set the flag to indicate fast-reboot is in progress. Set the key to expire in 3 minutes
$SONIC_DB_CLI STATE_DB SET "FAST_REBOOT|system" "1" "EX" "180"
fi
fi

if [ -e /tmp/pending_config_migration ] || [ -e /tmp/pending_config_initialization ]; then
Expand Down

0 comments on commit 7993c57

Please sign in to comment.