Skip to content

Commit

Permalink
[warm-reboot] Remove warmboot file path that overrides the default pa…
Browse files Browse the repository at this point in the history 
…th (#6198)

- Why I did it
The sai.profile file in kvm images overrides the warmboot file with path /var/cache/sai_warmboot.bin. Since the directory /var/cache is not mounted in syncd, it will be cleared in an image upgrade, the warm-reboot image upgrade will fail if the file is put in the directory.

Fix #6183

- How I did it
Remove the path that overrides the default path. The warmboot file path will then be the default value /var/warmboot/sai-warmboot.bin. Since /var/warmboot/ is mounted by /host/warmboot/ in the host, it could survive an image upgrade.

- How to verify it
Tested warm reboot upgrading kvm image locally.
  • Loading branch information
@shi-su
shi-su authored Dec 14, 2020
1 parent e010d83 commit 9580b04
Show file tree
Hide file tree
Showing 9 changed files with 0 additions and 18 deletions.
2 changes: 0 additions & 2 deletions device/virtual/x86_64-kvm_x86_64-r0/brcm_gearbox_vs/sai.profile
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
SAI_WARM_BOOT_READ_FILE=/var/cache/sai_warmboot.bin
SAI_WARM_BOOT_WRITE_FILE=/var/cache/sai_warmboot.bin
SAI_VS_SWITCH_TYPE=SAI_VS_SWITCH_TYPE_BCM56850
SAI_VS_HOSTIF_USE_TAP_DEVICE=true
SAI_VS_INTERFACE_LANE_MAP_FILE=/usr/share/sonic/hwsku/lanemap.ini
2 changes: 0 additions & 2 deletions device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/0/sai.profile
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
SAI_WARM_BOOT_READ_FILE=/var/cache/sai_warmboot.bin
SAI_WARM_BOOT_WRITE_FILE=/var/cache/sai_warmboot.bin
SAI_VS_SWITCH_TYPE=SAI_VS_SWITCH_TYPE_BCM56850
SAI_VS_HOSTIF_USE_TAP_DEVICE=true
SAI_VS_INTERFACE_LANE_MAP_FILE=/usr/share/sonic/hwsku/lanemap.ini
2 changes: 0 additions & 2 deletions device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/1/sai.profile
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
SAI_WARM_BOOT_READ_FILE=/var/cache/sai_warmboot.bin
SAI_WARM_BOOT_WRITE_FILE=/var/cache/sai_warmboot.bin
SAI_VS_SWITCH_TYPE=SAI_VS_SWITCH_TYPE_BCM56850
SAI_VS_HOSTIF_USE_TAP_DEVICE=true
SAI_VS_INTERFACE_LANE_MAP_FILE=/usr/share/sonic/hwsku/lanemap.ini
2 changes: 0 additions & 2 deletions device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/2/sai.profile
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
SAI_WARM_BOOT_READ_FILE=/var/cache/sai_warmboot.bin
SAI_WARM_BOOT_WRITE_FILE=/var/cache/sai_warmboot.bin
SAI_VS_SWITCH_TYPE=SAI_VS_SWITCH_TYPE_BCM56850
SAI_VS_HOSTIF_USE_TAP_DEVICE=true
SAI_VS_INTERFACE_LANE_MAP_FILE=/usr/share/sonic/hwsku/lanemap.ini
2 changes: 0 additions & 2 deletions device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/3/sai.profile
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
SAI_WARM_BOOT_READ_FILE=/var/cache/sai_warmboot.bin
SAI_WARM_BOOT_WRITE_FILE=/var/cache/sai_warmboot.bin
SAI_VS_SWITCH_TYPE=SAI_VS_SWITCH_TYPE_BCM56850
SAI_VS_HOSTIF_USE_TAP_DEVICE=true
SAI_VS_INTERFACE_LANE_MAP_FILE=/usr/share/sonic/hwsku/lanemap.ini
2 changes: 0 additions & 2 deletions device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/4/sai.profile
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
SAI_WARM_BOOT_READ_FILE=/var/cache/sai_warmboot.bin
SAI_WARM_BOOT_WRITE_FILE=/var/cache/sai_warmboot.bin
SAI_VS_SWITCH_TYPE=SAI_VS_SWITCH_TYPE_BCM56850
SAI_VS_HOSTIF_USE_TAP_DEVICE=true
SAI_VS_INTERFACE_LANE_MAP_FILE=/usr/share/sonic/hwsku/lanemap.ini
2 changes: 0 additions & 2 deletions device/virtual/x86_64-kvm_x86_64-r0/msft_multi_asic_vs/5/sai.profile
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
SAI_WARM_BOOT_READ_FILE=/var/cache/sai_warmboot.bin
SAI_WARM_BOOT_WRITE_FILE=/var/cache/sai_warmboot.bin
SAI_VS_SWITCH_TYPE=SAI_VS_SWITCH_TYPE_BCM56850
SAI_VS_HOSTIF_USE_TAP_DEVICE=true
SAI_VS_INTERFACE_LANE_MAP_FILE=/usr/share/sonic/hwsku/lanemap.ini
2 changes: 0 additions & 2 deletions src/sonic-device-data/src/pai.vs_profile
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
SAI_WARM_BOOT_READ_FILE=/var/cache/sai_warmboot.bin
SAI_WARM_BOOT_WRITE_FILE=/var/cache/sai_warmboot.bin
SAI_VS_SWITCH_TYPE=SAI_VS_SWITCH_TYPE_BCM81724
SAI_VS_SAI_SWITCH_TYPE=SAI_SWITCH_TYPE_PHY
SAI_VS_HOSTIF_USE_TAP_DEVICE=false
Expand Down
2 changes: 0 additions & 2 deletions src/sonic-device-data/src/sai.vs_profile
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
SAI_WARM_BOOT_READ_FILE=/var/cache/sai_warmboot.bin
SAI_WARM_BOOT_WRITE_FILE=/var/cache/sai_warmboot.bin
SAI_VS_SWITCH_TYPE=SAI_VS_SWITCH_TYPE_BCM56850
SAI_VS_HOSTIF_USE_TAP_DEVICE=true
SAI_VS_INTERFACE_LANE_MAP_FILE=/usr/share/sonic/hwsku/lanemap.ini
Expand Down

0 comments on commit 9580b04

Please sign in to comment.