Fixed FW upgrade sequence. by nazariig · Pull Request #2111 · sonic-net/sonic-buildimage

nazariig · 2018-10-02T15:07:46Z

Signed-off-by: Nazarii Hnydyn nazariig@mellanox.com

- What I did
Fixed FW upgrade sequence

- How I did it
Added logic to start FW upgrade on switch reboot after SONiC-To-SONiC update.
This will solve the issue when FW upgrade can be interrupted by swss restart.

- How to verify it

Perform SONiC-To-SONiC upgrade (FW versions should be different)
Reboot switch
Start parallel SSH session and restart swss

- Description for the changelog

N/A

- External dependencies

Added argument forwarder for platform reboot. sonic-utilities#333

Signed-off-by: Nazarii Hnydyn <nazariig@mellanox.com>

qiluo-msft · 2018-10-02T19:20:08Z

device/mellanox/x86_64-mlnx_msn2700-r0/platform_reboot

+    fi
+fi
+
+/sbin/reboot $@


exec ? #Closed

qiluo-msft · 2018-10-02T19:21:18Z

device/mellanox/x86_64-mlnx_msn2700-r0/platform_reboot

+
+FW_UPGRADE_SCRIPT="/usr/bin/mlnx-fw-upgrade.sh"
+
+NEXT_SONIC_IMAGE="$(sonic_installer list | grep "Next: " | cut -d ' ' -f 2)"


sonic_installer [](start = 20, length = 15)

Check run as root? #Closed

@qiluo-msft This script is a part of reboot where we already have this check. Do we really need to duplicate it? #WontFix

qiluo-msft · 2018-10-02T19:23:07Z

device/mellanox/x86_64-mlnx_msn2700-r0/platform_reboot

@@ -0,0 +1,47 @@
+#!/bin/bash
+
+FW_UPGRADE_SCRIPT="/usr/bin/mlnx-fw-upgrade.sh"


set -e
to make it strict on any error?

qiluo-msft

As comments

qiluo-msft · 2018-10-03T07:20:39Z

device/mellanox/x86_64-mlnx_msn2700-r0/platform_reboot

+
+ParseArguments $@
+
+if [[ "${CURRENT_SONIC_IMAGE}" != "${NEXT_SONIC_IMAGE}" ]]; then


Can you reuse code in https://github.com/Azure/sonic-utilities/blob/8819b4f7445f6389c3ceea1ee667993f2b586eba/scripts/fast-reboot#L39-L58 #Closed

Signed-off-by: Nazarii Hnydyn <nazariig@mellanox.com>

* Fixed FW upgrade sequence. * Removed code duplication.

* [mellanox] Enhance mlnx-fw-upgrade.sh (#1994) Install a new FW by specifying FW path (mlnx-fw-upgrade.sh /path/to/FW) or use default at '/etc/mlnx/fw-SPC.mfa' Signed-off-by: Stepan Blyschak <stepanb@mellanox.com> * Fixed FW upgrade sequence. (#2111) * Fixed FW upgrade sequence. * Removed code duplication.

Update the sonic-swss submodule. The following are new commits in the submodule: 6cb43ee [p4orch] Fix handlePortStatusChangeNotification status deserialize (#2111) 863f0f1 [azp]: Enable PR diff coverage (#2083) bf4cd4a Fix the unsafe usage of strncpy in portsorch.cpp (#2110) c1b4b40 support port isolation group in BFN platform (#1940) Signed-off-by: Andriy Kokhan <andriyx.kokhan@intel.com>

…onic-net#2111) *Moved sai_deserialize_free_port_oper_status_ntf(count, port_oper_status); call outside the loop iterating port_oper_status array. Signed-off-by: Volodymyr Boyko <volodymyrx.boiko@intel.com>

…rm-common] advance submodule head linkmgrd: * e0fe1d4 2022-07-27 | TSA enhancement (sonic-net#98) (HEAD -> 202205) [Jing Zhang] utilities: * 7d7e15e 2022-07-18 | [vnet_route_check] Align DB data parse logic with format used by swsscommon API (sonic-net#2268) (HEAD -> 202205) [Volodymyr Samotiy] * b3d5d18 2022-07-20 | [MultiAsic] sudo reboot command doesn't gracefully stop Asic syncd# on multiasic platform (sonic-net#2258) [Marty Y. Lok] * 504ebe6 2022-07-08 | Add 'traffic_shift_away' option to config load_minigraph (sonic-net#2240) [tjchadaga] * 4079e4a 2022-06-20 | Gives cisco-8000 more flexibility to easily add subcommnads under show platform (sonic-net#2213) [Nathan Cohen] * 46443c6 2022-07-27 | Update db_migrator to support `PORT_QOS_MAP|global` (sonic-net#2205) [bingwang-ms] * d7fbdd6 2022-05-26 | fix for non-coherent cmis modules (sonic-net#2163) [qinchuanares] * 79b4439 2022-06-24 | [sfpshow/sfputil] Enhance sfpshow and sfputil to behavior correctly on RJ45 ports (sonic-net#2111) [Kebo Liu] swss: * 275f311 2022-07-26 | [DualToR] Handle race condition between tunnel_decap and mux orchestrator (sonic-net#2397) (HEAD -> 202205) [Devesh Pathak] * 47586e8 2022-07-22 | [EVPN]Fix missing Vlan member update notification in P2MP scenario (sonic-net#2388) [Sudharsan Dhamal Gopalarathnam] * 7d5c73f 2022-07-19 | [macsecmgr]: Fix cleanup macsec objs if container stop (sonic-net#2376) [Ze Gan] * c03996f 2022-07-17 | [orchagent]: Enhance initSaiPhyApi (sonic-net#2367) [andywongarista] * 57890d7 2022-07-27 | Fix for remote system interface not getting created (sonic-net#2364) [skeesara-nokia] * 1a93ec9 2022-07-13 | Orchagent changes for synchronizing npu/phy device Tx in the data path before enabling transceiver<CMIS compliant> Tx. (sonic-net#2277) [jaganbal-a] sairedis: * a4903be 2022-07-20 | Update PN with XPN support (sonic-net#1081) (HEAD -> 202205, github/202205) [Ze Gan] * 2cb5671 2022-07-27 | Add SAI_OBJECT_TYPE_TUNNEL object to break-before-make list (sonic-net#1075) [Vaibhav Hemant Dixit] platform-daemon: * 901c6a1 2022-06-28 | [CMIS]Improved 400G link bring up sequence (sonic-net#254) (HEAD -> 202205) [Prince George] platform-common: * f223b3f 2022-07-09 | Support get_port_or_cage_type (sonic-net#288) (HEAD -> 202205) [Stephen Sun] Signed-off-by: Ying Xie <ying.xie@microsoft.com>

…rm-common] advance submodule head (#11578) linkmgrd: * e0fe1d4 2022-07-27 | TSA enhancement (#98) (HEAD -> 202205) [Jing Zhang] utilities: * 7d7e15e 2022-07-18 | [vnet_route_check] Align DB data parse logic with format used by swsscommon API (#2268) (HEAD -> 202205) [Volodymyr Samotiy] * b3d5d18 2022-07-20 | [MultiAsic] sudo reboot command doesn't gracefully stop Asic syncd# on multiasic platform (#2258) [Marty Y. Lok] * 504ebe6 2022-07-08 | Add 'traffic_shift_away' option to config load_minigraph (#2240) [tjchadaga] * 4079e4a 2022-06-20 | Gives cisco-8000 more flexibility to easily add subcommnads under show platform (#2213) [Nathan Cohen] * 46443c6 2022-07-27 | Update db_migrator to support `PORT_QOS_MAP|global` (#2205) [bingwang-ms] * d7fbdd6 2022-05-26 | fix for non-coherent cmis modules (#2163) [qinchuanares] * 79b4439 2022-06-24 | [sfpshow/sfputil] Enhance sfpshow and sfputil to behavior correctly on RJ45 ports (#2111) [Kebo Liu] swss: * 275f311 2022-07-26 | [DualToR] Handle race condition between tunnel_decap and mux orchestrator (#2397) (HEAD -> 202205) [Devesh Pathak] * 47586e8 2022-07-22 | [EVPN]Fix missing Vlan member update notification in P2MP scenario (#2388) [Sudharsan Dhamal Gopalarathnam] * 7d5c73f 2022-07-19 | [macsecmgr]: Fix cleanup macsec objs if container stop (#2376) [Ze Gan] * c03996f 2022-07-17 | [orchagent]: Enhance initSaiPhyApi (#2367) [andywongarista] * 57890d7 2022-07-27 | Fix for remote system interface not getting created (#2364) [skeesara-nokia] * 1a93ec9 2022-07-13 | Orchagent changes for synchronizing npu/phy device Tx in the data path before enabling transceiver<CMIS compliant> Tx. (#2277) [jaganbal-a] sairedis: * a4903be 2022-07-20 | Update PN with XPN support (#1081) (HEAD -> 202205, github/202205) [Ze Gan] * 2cb5671 2022-07-27 | Add SAI_OBJECT_TYPE_TUNNEL object to break-before-make list (#1075) [Vaibhav Hemant Dixit] platform-daemon: * 901c6a1 2022-06-28 | [CMIS]Improved 400G link bring up sequence (#254) (HEAD -> 202205) [Prince George] platform-common: * f223b3f 2022-07-09 | Support get_port_or_cage_type (#288) (HEAD -> 202205) [Stephen Sun] Signed-off-by: Ying Xie <ying.xie@microsoft.com>

…rm-common] advance submodule head (sonic-net#11578) linkmgrd: * e0fe1d4 2022-07-27 | TSA enhancement (sonic-net#98) (HEAD -> 202205) [Jing Zhang] utilities: * 7d7e15e 2022-07-18 | [vnet_route_check] Align DB data parse logic with format used by swsscommon API (sonic-net#2268) (HEAD -> 202205) [Volodymyr Samotiy] * b3d5d18 2022-07-20 | [MultiAsic] sudo reboot command doesn't gracefully stop Asic syncd# on multiasic platform (sonic-net#2258) [Marty Y. Lok] * 504ebe6 2022-07-08 | Add 'traffic_shift_away' option to config load_minigraph (sonic-net#2240) [tjchadaga] * 4079e4a 2022-06-20 | Gives cisco-8000 more flexibility to easily add subcommnads under show platform (sonic-net#2213) [Nathan Cohen] * 46443c6 2022-07-27 | Update db_migrator to support `PORT_QOS_MAP|global` (sonic-net#2205) [bingwang-ms] * d7fbdd6 2022-05-26 | fix for non-coherent cmis modules (sonic-net#2163) [qinchuanares] * 79b4439 2022-06-24 | [sfpshow/sfputil] Enhance sfpshow and sfputil to behavior correctly on RJ45 ports (sonic-net#2111) [Kebo Liu] swss: * 275f311 2022-07-26 | [DualToR] Handle race condition between tunnel_decap and mux orchestrator (sonic-net#2397) (HEAD -> 202205) [Devesh Pathak] * 47586e8 2022-07-22 | [EVPN]Fix missing Vlan member update notification in P2MP scenario (sonic-net#2388) [Sudharsan Dhamal Gopalarathnam] * 7d5c73f 2022-07-19 | [macsecmgr]: Fix cleanup macsec objs if container stop (sonic-net#2376) [Ze Gan] * c03996f 2022-07-17 | [orchagent]: Enhance initSaiPhyApi (sonic-net#2367) [andywongarista] * 57890d7 2022-07-27 | Fix for remote system interface not getting created (sonic-net#2364) [skeesara-nokia] * 1a93ec9 2022-07-13 | Orchagent changes for synchronizing npu/phy device Tx in the data path before enabling transceiver<CMIS compliant> Tx. (sonic-net#2277) [jaganbal-a] sairedis: * a4903be 2022-07-20 | Update PN with XPN support (sonic-net#1081) (HEAD -> 202205, github/202205) [Ze Gan] * 2cb5671 2022-07-27 | Add SAI_OBJECT_TYPE_TUNNEL object to break-before-make list (sonic-net#1075) [Vaibhav Hemant Dixit] platform-daemon: * 901c6a1 2022-06-28 | [CMIS]Improved 400G link bring up sequence (sonic-net#254) (HEAD -> 202205) [Prince George] platform-common: * f223b3f 2022-07-09 | Support get_port_or_cage_type (sonic-net#288) (HEAD -> 202205) [Stephen Sun] Signed-off-by: Ying Xie <ying.xie@microsoft.com>

…n RJ45 ports (sonic-net#2111) * enhance show interface transceiver eeprom logic with RJ45 port support Signed-off-by: Kebo Liu <kebol@nvidia.com> * enhance sfputil to support RJ45 port, exclude error status * fix sfputil issue on RJ45 port Signed-off-by: Kebo Liu <kebol@nvidia.com> * [RJ45] change the way to judge port type and add more UT test case Signed-off-by: Kebo Liu <kebol@nvidia.com> * [sfputil] simplity the logic for RJ45 support Signed-off-by: Kebo Liu <kebol@nvidia.com> * Support sfputil show present Signed-off-by: Stephen Sun <stephens@nvidia.com> * Support rj45 in sfpshow Signed-off-by: Stephen Sun <stephens@nvidia.com> * Add test case for sfputil with RJ45 supported Signed-off-by: Stephen Sun <stephens@nvidia.com> * Add mock data for RJ45 ports into STATE_DB Signed-off-by: Stephen Sun <stephens@nvidia.com> * Add test for sfputil show for RJ45 ports Signed-off-by: Stephen Sun <stephens@nvidia.com> * remove debug code in sfputil test case Signed-off-by: Kebo Liu <kebol@nvidia.com> * remove unnecessary argument for format() Signed-off-by: Kebo Liu <kebol@nvidia.com> * Revert the logic to fetch presence status from error status for RJ45 port (#17) * Revert the logic to fetch presence status from error status Signed-off-by: Stephen Sun <stephens@nvidia.com> * Unit test Signed-off-by: Stephen Sun <stephens@nvidia.com> * Fix error Signed-off-by: Stephen Sun <stephens@nvidia.com> * Add test cases to cover lpmode and error status Signed-off-by: Stephen Sun <stephens@nvidia.com> * add comments to describe the usage of functions to judge the port type Signed-off-by: Kebo Liu <kebol@nvidia.com> * add more testcase for sfputil Signed-off-by: Kebo Liu <kebol@nvidia.com> * fix typo in testcase name Signed-off-by: Kebo Liu <kebol@nvidia.com> Co-authored-by: Stephen Sun <stephens@nvidia.com> Co-authored-by: Stephen Sun <5379172+stephenxs@users.noreply.github.com>

Fixed FW upgrade sequence.

fbd8736

Signed-off-by: Nazarii Hnydyn <nazariig@mellanox.com>

lguohan approved these changes Oct 2, 2018

View reviewed changes

qiluo-msft reviewed Oct 2, 2018

View reviewed changes

qiluo-msft requested a review from jleveque October 2, 2018 19:24

qiluo-msft requested changes Oct 2, 2018

View reviewed changes

qiluo-msft reviewed Oct 3, 2018

View reviewed changes

Removed code duplication.

b7fd330

Signed-off-by: Nazarii Hnydyn <nazariig@mellanox.com>

qiluo-msft approved these changes Oct 4, 2018

View reviewed changes

nazariig mentioned this pull request Oct 5, 2018

Added argument forwarder for platform reboot. sonic-net/sonic-utilities#333

Merged

qiluo-msft merged commit a1715a1 into sonic-net:master Oct 5, 2018

stcheng added Bug 🐛 Platform: Mellanox labels Nov 7, 2018

andriymoroz-mlnx pushed a commit to andriymoroz-mlnx/sonic-buildimage_old that referenced this pull request Apr 15, 2019

Fixed FW upgrade sequence. (sonic-net#2111)

d5e522b

* Fixed FW upgrade sequence. * Removed code duplication.

yxieca mentioned this pull request Jul 28, 2022

[202205][linkmgrd][utilities][swss][sairedis][platform-daemon][platform-common] advance submodule head #11578

Merged

aravindmani-1 mentioned this pull request Nov 18, 2022

[Submodule] Update sonic-utilities pointer #12760

Merged

7 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fixed FW upgrade sequence.#2111

Fixed FW upgrade sequence.#2111
qiluo-msft merged 2 commits intosonic-net:masterfrom
nazariig:master-mlnx-fw-upgrade-fix

nazariig commented Oct 2, 2018 •

edited

Loading

Uh oh!

qiluo-msft Oct 2, 2018 •

edited

Loading

Uh oh!

qiluo-msft Oct 2, 2018 •

edited

Loading

Uh oh!

nazariig Oct 4, 2018 •

edited by qiluo-msft

Loading

Uh oh!

qiluo-msft Oct 2, 2018

Uh oh!

qiluo-msft left a comment

Uh oh!

qiluo-msft Oct 3, 2018 •

edited

Loading

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants


		FW_UPGRADE_SCRIPT="/usr/bin/mlnx-fw-upgrade.sh"

		NEXT_SONIC_IMAGE="$(sonic_installer list \| grep "Next: " \| cut -d ' ' -f 2)"

		@@ -0,0 +1,47 @@
		#!/bin/bash

		FW_UPGRADE_SCRIPT="/usr/bin/mlnx-fw-upgrade.sh"


		ParseArguments $@

		if [[ "${CURRENT_SONIC_IMAGE}" != "${NEXT_SONIC_IMAGE}" ]]; then

Conversation

nazariig commented Oct 2, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

qiluo-msft Oct 2, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

qiluo-msft Oct 2, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

nazariig Oct 4, 2018 • edited by qiluo-msft Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

qiluo-msft Oct 2, 2018

Choose a reason for hiding this comment

Uh oh!

qiluo-msft left a comment

Choose a reason for hiding this comment

Uh oh!

qiluo-msft Oct 3, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

nazariig commented Oct 2, 2018 •

edited

Loading

qiluo-msft Oct 2, 2018 •

edited

Loading

qiluo-msft Oct 2, 2018 •

edited

Loading

nazariig Oct 4, 2018 •

edited by qiluo-msft

Loading

qiluo-msft Oct 3, 2018 •

edited

Loading