New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Mellanox|FFB]: Add support for Mellanox fast-fast boot in syncd #389

Merged

lguohan merged 5 commits into sonic-net:master from volodymyrsamotiy:mlnx-ffb

Dec 3, 2018

Collaborator

volodymyrsamotiy commented Nov 23, 2018 •

edited

Loading

Signed-off-by: Stepan Blyschak stepanb@mellanox.com
Signed-off-by: Volodymyr Samotiy volodymyrs@mellanox.com

Stepan Blyschak and others added 2 commits

November 23, 2018 14:30


          [mlnx|ffb] Add fast-fast boot option in syncd

9ed8451

Signed-off-by: Stepan Blyschak <stepanb@mellanox.com>


          [mlnx|ffb]: Add support of "config end" event for mlnx fast-fast boot

7d8114a

Signed-off-by: Volodymyr Samotiy <volodymyrs@mellanox.com>

volodymyrsamotiy mentioned this pull request

[Mellanox|FFB]: Add support for Mellanox fast-fast boot sonic-net/sonic-buildimage#2294

Merged

Collaborator

kcudnik commented Nov 25, 2018 •

edited

Loading

WARNING: Word 'Mellanox' is misspelled ../syncd/syncd.cpp
WARNING: Word 'requieres' is misspelled ../syncd/syncd.cpp

please add Mellanox to aspell dict and correct requires


          [mlnx|ffb]: Fix misspelled words for aspell check

a2bb751

Signed-off-by: Volodymyr Samotiy <volodymyrs@mellanox.com>

lguohan reviewed

View reviewed changes

syncd/syncd.cpp Outdated

@@ @@ -2919,7 +2919,7 @@ void printUsage() @@
               {
                   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

lguohan Nov 28, 2018

->fastfast. prefer not to have - here.

lguohan reviewed

View reviewed changes

syncd/syncd.cpp Outdated

@@ @@ -2929,7 +2929,7 @@ void printUsage() @@
                   std::cout << "    -i --countersInterval interval" << std::endl;
                   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;

Contributor

lguohan Nov 28, 2018

fastfast

lguohan reviewed

View reviewed changes

syncd/syncd.cpp Outdated

@@ @@ -3028,6 +3028,10 @@ void handleCmdLine(int argc, char **argv) @@
                               {
                                   options.startType = SAI_FAST_BOOT;
                               }
+                              else if (std::string(optarg) == "fast-fast")

Contributor

lguohan Nov 28, 2018

fastfast

lguohan reviewed

View reviewed changes

syncd/syncd.cpp Outdated

@@ @@ -3028,6 +3028,10 @@ void handleCmdLine(int argc, char **argv) @@
                               {
                                   options.startType = SAI_FAST_BOOT;
                               }
+                              else if (std::string(optarg) == "fast-fast")
+                              {
+                                  options.startType = SAI_FAST_FAST_BOOT;

Contributor

lguohan Nov 28, 2018

SAI_FASTFAST_BOOT

lguohan reviewed

View reviewed changes

syncd/scripts/syncd_init_common.sh

@@ @@ -24,12 +24,20 @@ fi @@
               # Use temporary view between init and apply
               CMD_ARGS+=" -u"
-              case "$(cat /proc/cmdline)" in
-                *fast-reboot*)
+              BOOT_TYPE="$(cat /proc/cmdline | grep -o 'SONIC_BOOT_TYPE=\S*' | cut -d'=' -f2)"

Contributor

lguohan Nov 28, 2018

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

View reviewed changes

syncd/scripts/syncd_init_common.sh

+              BOOT_TYPE="$(cat /proc/cmdline | grep -o 'SONIC_BOOT_TYPE=\S*' | cut -d'=' -f2)"
+              case "$BOOT_TYPE" in
+                fast-reboot)

Contributor

lguohan Nov 28, 2018

since you are breaking backward compatibility, I suggest to you to change to fast and remove -reboot.

lguohan reviewed

View reviewed changes

syncd/scripts/syncd_init_common.sh Outdated

                    FAST_REBOOT='yes'
                   ;;
+                fast-fast)

Contributor

lguohan Nov 28, 2018

-> fastfast

lguohan reviewed

View reviewed changes

syncd/scripts/syncd_init_common.sh

                    FAST_REBOOT='yes'
                   ;;
+                fast-fast)
+                  if [ -e /var/warmboot/issu_started ]; then

Contributor

lguohan Nov 28, 2018

what is this flag? why kernel cmdline is not enough?

lguohan reviewed

View reviewed changes

syncd/scripts/syncd_init_common.sh Outdated

                    FAST_REBOOT='yes'
                   ;;
+                fast-fast)
+                  if [ -e /var/warmboot/issu_started ]; then
+                      FAST_FAST_REBOOT='yes'

Contributor

lguohan Nov 28, 2018

FASTFAST_BOOT

lguohan reviewed

View reviewed changes

syncd/scripts/syncd_init_common.sh Outdated

                 *)
                    FAST_REBOOT='no'
+                   FAST_FAST_REBOOT='no'

Contributor

lguohan Nov 28, 2018

FASTFAST_BOOT

lguohan reviewed

View reviewed changes

syncd/scripts/syncd_init_common.sh

		@@ -55,6 +63,8 @@ function set_start_type()
		CMD_ARGS+=" -t warm"
		elif [ $FAST_REBOOT == "yes" ]; then

Contributor

lguohan Nov 28, 2018

-> FAST_BOOT

lguohan reviewed

View reviewed changes

syncd/scripts/syncd_init_common.sh Outdated

@@ @@ -55,6 +63,8 @@ function set_start_type() @@
                       CMD_ARGS+=" -t warm"
                   elif [ $FAST_REBOOT == "yes" ]; then
                       CMD_ARGS+=" -t fast"
+                  elif [ $FAST_FAST_REBOOT == "yes" ]; then

Contributor

lguohan Nov 28, 2018

FASTFAST_BOOT

lguohan reviewed

View reviewed changes

syncd/scripts/syncd_init_common.sh Outdated

@@ @@ -55,6 +63,8 @@ function set_start_type() @@
                       CMD_ARGS+=" -t warm"
                   elif [ $FAST_REBOOT == "yes" ]; then
                       CMD_ARGS+=" -t fast"
+                  elif [ $FAST_FAST_REBOOT == "yes" ]; then
+                      CMD_ARGS+=" -t fast-fast"

Contributor

lguohan Nov 28, 2018

fastfast


          [Mellanox|FFB]: Fix review comments

3f1433f

* Change naming convention from "fast-fast" to "fastfast"

Signed-off-by: Volodymyr Samotiy <volodymyrs@mellanox.com>

Contributor

lguohan commented Nov 30, 2018

retest this please

lguohan approved these changes

View reviewed changes

volodymyrsamotiy changed the title ~~[mlnx|ffb]: Add support for mellanox fast-fast boot in syncd~~ [Mellanox|FFB]: Add support for Mellanox fast-fast boot in syncd


          [Mellanox|FFB]: Add misspelled word 'fastfast' to aspellcheck dictionary

99d8c38

lguohan merged commit 1288f77 into sonic-net:master

qiluo-msft reviewed

View reviewed changes

syncd/scripts/syncd_init_common.sh

@@ @@ -24,12 +24,20 @@ fi @@
               # Use temporary view between init and apply
               CMD_ARGS+=" -u"
-              case "$(cat /proc/cmdline)" in
-                *fast-reboot*)
+              BOOT_TYPE="$(cat /proc/cmdline | grep -o 'SONIC_BOOT_TYPE=\S*' | cut -d'=' -f2)"

Contributor

qiluo-msft Jun 25, 2019

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


          [Mellanox|FFB]: Add support for Mellanox fast-fast boot in syncd (son…

2e5ca0c

…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


          [Mellanox|FFB]: Add support for Mellanox fast-fast boot in syncd (son…

edeeda0

…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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet