[Mellanox|FFB]: Add support for Mellanox fast-fast boot in syncd#389
Merged
lguohan merged 5 commits intosonic-net:masterfrom Dec 3, 2018
Merged
[Mellanox|FFB]: Add support for Mellanox fast-fast boot in syncd#389lguohan merged 5 commits intosonic-net:masterfrom
lguohan merged 5 commits intosonic-net:masterfrom
Conversation
Signed-off-by: Stepan Blyschak <stepanb@mellanox.com>
Signed-off-by: Volodymyr Samotiy <volodymyrs@mellanox.com>
Collaborator
|
WARNING: Word 'Mellanox' is misspelled ../syncd/syncd.cpp please add Mellanox to aspell dict and correct requires |
Signed-off-by: Volodymyr Samotiy <volodymyrs@mellanox.com>
lguohan
reviewed
Nov 28, 2018
syncd/syncd.cpp
Outdated
| SWSS_LOG_ENTER(); | ||
|
|
||
| std::cout << "Usage: syncd [-N] [-U] [-d] [-p profile] [-i interval] [-t [cold|warm|fast]] [-h] [-u] [-S]" << std::endl; | ||
| std::cout << "Usage: syncd [-N] [-U] [-d] [-p profile] [-i interval] [-t [cold|warm|fast|fast-fast]] [-h] [-u] [-S]" << std::endl; |
Contributor
There was a problem hiding this comment.
->fastfast. prefer not to have - here.
lguohan
reviewed
Nov 28, 2018
syncd/syncd.cpp
Outdated
| std::cout << " Provide counter thread interval" << std::endl; | ||
| std::cout << " -t --startType type" << std::endl; | ||
| std::cout << " Specify cold|warm|fast start type" << std::endl; | ||
| std::cout << " Specify cold|warm|fast|fast-fast start type" << std::endl; |
lguohan
reviewed
Nov 28, 2018
syncd/syncd.cpp
Outdated
| { | ||
| options.startType = SAI_FAST_BOOT; | ||
| } | ||
| else if (std::string(optarg) == "fast-fast") |
lguohan
reviewed
Nov 28, 2018
syncd/syncd.cpp
Outdated
| } | ||
| else if (std::string(optarg) == "fast-fast") | ||
| { | ||
| options.startType = SAI_FAST_FAST_BOOT; |
lguohan
reviewed
Nov 28, 2018
|
|
||
| case "$(cat /proc/cmdline)" in | ||
| *fast-reboot*) | ||
| BOOT_TYPE="$(cat /proc/cmdline | grep -o 'SONIC_BOOT_TYPE=\S*' | cut -d'=' -f2)" |
Contributor
There was a problem hiding this comment.
this can cause compatibility issue. image you are on old image and want to fastfast boot into new image. We need to be aware of this issue.
lguohan
reviewed
Nov 28, 2018
| BOOT_TYPE="$(cat /proc/cmdline | grep -o 'SONIC_BOOT_TYPE=\S*' | cut -d'=' -f2)" | ||
|
|
||
| case "$BOOT_TYPE" in | ||
| fast-reboot) |
Contributor
There was a problem hiding this comment.
since you are breaking backward compatibility, I suggest to you to change to fast and remove -reboot.
lguohan
reviewed
Nov 28, 2018
syncd/scripts/syncd_init_common.sh
Outdated
| fast-reboot) | ||
| FAST_REBOOT='yes' | ||
| ;; | ||
| fast-fast) |
lguohan
reviewed
Nov 28, 2018
| FAST_REBOOT='yes' | ||
| ;; | ||
| fast-fast) | ||
| if [ -e /var/warmboot/issu_started ]; then |
Contributor
There was a problem hiding this comment.
what is this flag? why kernel cmdline is not enough?
lguohan
reviewed
Nov 28, 2018
syncd/scripts/syncd_init_common.sh
Outdated
| ;; | ||
| fast-fast) | ||
| if [ -e /var/warmboot/issu_started ]; then | ||
| FAST_FAST_REBOOT='yes' |
lguohan
reviewed
Nov 28, 2018
syncd/scripts/syncd_init_common.sh
Outdated
| ;; | ||
| *) | ||
| FAST_REBOOT='no' | ||
| FAST_FAST_REBOOT='no' |
lguohan
reviewed
Nov 28, 2018
| @@ -55,6 +63,8 @@ function set_start_type() | |||
| CMD_ARGS+=" -t warm" | |||
| elif [ $FAST_REBOOT == "yes" ]; then | |||
lguohan
reviewed
Nov 28, 2018
syncd/scripts/syncd_init_common.sh
Outdated
| CMD_ARGS+=" -t warm" | ||
| elif [ $FAST_REBOOT == "yes" ]; then | ||
| CMD_ARGS+=" -t fast" | ||
| elif [ $FAST_FAST_REBOOT == "yes" ]; then |
lguohan
reviewed
Nov 28, 2018
syncd/scripts/syncd_init_common.sh
Outdated
| elif [ $FAST_REBOOT == "yes" ]; then | ||
| CMD_ARGS+=" -t fast" | ||
| elif [ $FAST_FAST_REBOOT == "yes" ]; then | ||
| CMD_ARGS+=" -t fast-fast" |
* Change naming convention from "fast-fast" to "fastfast" Signed-off-by: Volodymyr Samotiy <volodymyrs@mellanox.com>
Contributor
|
retest this please |
lguohan
approved these changes
Nov 30, 2018
volodymyrsamotiy
changed the title
qiluo-msft
reviewed
Jun 25, 2019
|
|
||
| case "$(cat /proc/cmdline)" in | ||
| *fast-reboot*) | ||
| BOOT_TYPE="$(cat /proc/cmdline | grep -o 'SONIC_BOOT_TYPE=\S*' | cut -d'=' -f2)" |
Contributor
There was a problem hiding this comment.
SONIC_BOOT_TYPE= [](start = 42, length = 16)
We should handle both cases for backward-compatible with 201803:
fast-reboot
SONIC_BOOT_TYPE=fast-reboot
Otherwise we cannot fast-reboot from 201803 into 201811.
volodymyrsamotiy
pushed a commit
to volodymyrsamotiy/sonic-sairedis
that referenced
this pull request
Jul 30, 2019
…ic-net#389) * [mlnx|ffb] Add fast-fast boot option in syncd Signed-off-by: Stepan Blyschak <stepanb@mellanox.com> * [mlnx|ffb]: Add support of "config end" event for mlnx fast-fast boot Signed-off-by: Volodymyr Samotiy <volodymyrs@mellanox.com> * [mlnx|ffb]: Fix misspelled words for aspell check Signed-off-by: Volodymyr Samotiy <volodymyrs@mellanox.com> * [Mellanox|FFB]: Fix review comments * Change naming convention from "fast-fast" to "fastfast" Signed-off-by: Volodymyr Samotiy <volodymyrs@mellanox.com> * [Mellanox|FFB]: Add misspelled word 'fastfast' to aspellcheck dictionary
pettershao-ragilenetworks
pushed a commit
to pettershao-ragilenetworks/sonic-sairedis
that referenced
this pull request
Nov 18, 2022
…ic-net#389) * [mlnx|ffb] Add fast-fast boot option in syncd Signed-off-by: Stepan Blyschak <stepanb@mellanox.com> * [mlnx|ffb]: Add support of "config end" event for mlnx fast-fast boot Signed-off-by: Volodymyr Samotiy <volodymyrs@mellanox.com> * [mlnx|ffb]: Fix misspelled words for aspell check Signed-off-by: Volodymyr Samotiy <volodymyrs@mellanox.com> * [Mellanox|FFB]: Fix review comments * Change naming convention from "fast-fast" to "fastfast" Signed-off-by: Volodymyr Samotiy <volodymyrs@mellanox.com> * [Mellanox|FFB]: Add misspelled word 'fastfast' to aspellcheck dictionary
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
4 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.
Signed-off-by: Stepan Blyschak stepanb@mellanox.com
Signed-off-by: Volodymyr Samotiy volodymyrs@mellanox.com