fix fast reboot compatibility#3083
Merged
qiluo-msft merged 3 commits intosonic-net:masterfrom Jun 26, 2019
Merged
Conversation
We should handle both cases for backward-compatible with 201803: - fast-reboot - SONIC_BOOT_TYPE=fast-reboot Signed-off-by: Stepan Blyschak <stepanb@mellanox.com>
Collaborator
Author
|
Retest vs please |
qiluo-msft
reviewed
Jun 25, 2019
| case "$(cat /proc/cmdline | grep -o 'SONIC_BOOT_TYPE=\S*' | cut -d'=' -f2)" in | ||
| warm*) | ||
| case "$(cat /proc/cmdline)" in | ||
| *warm*) |
Collaborator
There was a problem hiding this comment.
warm [](start = 5, length = 4)
Be more specific SONIC_BOOT_TYPE=warm #Closed
qiluo-msft
reviewed
Jun 25, 2019
| TYPE='warm' | ||
| ;; | ||
| fastfast) | ||
| *fastfast*) |
Collaborator
There was a problem hiding this comment.
fastfast [](start = 5, length = 8)
Be more specific SONIC_BOOT_TYPE=fastfast #Closed
qiluo-msft
reviewed
Jun 25, 2019
| TYPE='fastfast' | ||
| ;; | ||
| fast*) | ||
| *fast*) |
Collaborator
There was a problem hiding this comment.
fast [](start = 4, length = 6)
This one is also too general. We can match for 2 patterns:
*SONIC_BOOT_TYPE=fast**fast-reboot*#Closed
qiluo-msft
reviewed
Jun 25, 2019
| @@ -34,14 +34,14 @@ function updateHostName() | |||
| function getBootType() | |||
| { | |||
| local BOOT_TYPE | |||
Collaborator
There was a problem hiding this comment.
local BOOT_TYPE [](start = 4, length = 15)
This line can be removed. #Closed
qiluo-msft
reviewed
Jun 25, 2019
| @@ -55,14 +55,14 @@ function wait_for_database_service() | |||
|
|
|||
| function getBootType() | |||
Collaborator
There was a problem hiding this comment.
getBootType [](start = 9, length = 11)
Can we reuse the function in /usr/bin/syncd.sh? If not, make sure you share the exactly same code snippet, add code comments referring each other so we will not modify one without the other in future by mistake. #Closed
added 2 commits
June 26, 2019 15:31
Signed-off-by: Stepan Blyschak <stepanb@mellanox.com>
two files Signed-off-by: Stepan Blyschak <stepanb@mellanox.com>
qiluo-msft
approved these changes
Jun 26, 2019
qiluo-msft
pushed a commit
to qiluo-msft/sonic-buildimage
that referenced
this pull request
Jun 26, 2019
srideepDell
added a commit
to project-arlo/sonic-buildimage
that referenced
this pull request
Jun 27, 2019
fix fast reboot compatibility (sonic-net#3083)
yxieca
pushed a commit
that referenced
this pull request
Jul 10, 2019
* fix fast reboot compatibility We should handle both cases for backward-compatible with 201803: - fast-reboot - SONIC_BOOT_TYPE=fast-reboot * handle review comments * add a comment that getBootType code snippet is shared between two files
seiferteric
pushed a commit
to project-arlo/sonic-buildimage
that referenced
this pull request
Oct 14, 2019
* fix fast reboot compatibility We should handle both cases for backward-compatible with 201803: - fast-reboot - SONIC_BOOT_TYPE=fast-reboot * handle review comments * add a comment that getBootType code snippet is shared between two files
seiferteric
pushed a commit
to project-arlo/sonic-buildimage
that referenced
this pull request
Oct 14, 2019
1. squash changes of the following commits, as a series of cherry-pick will cause the Change-Id checker to fail, and hence unable to push to Gerrit * 282180c Added S5232 led bin files missed from Azure branch * 94b71b3 fix fast reboot compatibility (sonic-net#3083) * b3a5432 Changes fix fpga driver crash Changes to support 10G EEPROM read. Changes to fix FPGA version read * 3d73b8d Deprecate unwanted file which is not being used * fe2b6b9 Fixing Z9332f lanes as broadcom SAI is fixed to return correct lanes * fd2b0d8 Changes to fix 10G ports for Z9264f Changes to fix show environment for Z9264f 2. revert the common code changes from '94b71b31 fix fast reboot ...' * files/build_templates/docker_image_ctl.j2 * files/scripts/syncd.sh Change-Id: I7062bad65dd1c102d411a47f94ebb952245327ff
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
We should handle both cases for backward-compatible with 201803:
Signed-off-by: Stepan Blyschak stepanb@mellanox.com
NOTE : DEPENDS on sonic-net/sonic-sairedis#480
- What I did
- How I did it
- How to verify it
Run 201803 (157th public jenkins image + #3077) -> 201811 (73th public jenkins image + this PR)
Run 201811 (73th public jenkins image + this PR) fast reboot test
Run 201811 (73th public jenkins image + this PR) warm reboot test
- Description for the changelog
- A picture of a cute animal (not mandatory but encouraged)