From 74b45be4873fc671979bbdba8dc74f7153e667c0 Mon Sep 17 00:00:00 2001
From: pavel-shirshov <pavelsh@microsoft.com>
Date: Wed, 4 Dec 2019 14:10:19 -0800
Subject: [PATCH] [fast-reboot]: Save fast-reboot state into the db (#3741)

Put a flag for fast-reboot to the db using EXPIRE feature. Using this flag in other part of SONiC to start in Fast-reboot mode. If we reload a config, the state in the db will be removed.
---
 dockers/docker-base-stretch/Dockerfile.j2    | 8 +++++++-
 dockers/docker-orchagent/Dockerfile.j2       | 7 -------
 dockers/docker-sonic-telemetry/Dockerfile.j2 | 9 +--------
 dockers/docker-teamd/Dockerfile.j2           | 9 +--------
 files/build_templates/docker_image_ctl.j2    | 5 +++++
 files/scripts/syncd.sh                       | 7 ++++++-
 rules/docker-base-stretch.mk                 | 2 +-
 src/sonic-quagga                             | 2 +-
 8 files changed, 22 insertions(+), 27 deletions(-)

diff --git a/dockers/docker-base-stretch/Dockerfile.j2 b/dockers/docker-base-stretch/Dockerfile.j2
index 95272e2322..3b3ede376d 100644
--- a/dockers/docker-base-stretch/Dockerfile.j2
+++ b/dockers/docker-base-stretch/Dockerfile.j2
@@ -47,7 +47,13 @@ RUN apt-get update &&        \
         vim-tiny             \
 # Install dependencies of supervisor
         python-pkg-resources \
-        python-meld3
+        python-meld3         \
+# dependencies of redis-tools
+        libatomic1           \
+        libjemalloc1         \
+        liblua5.1-0          \
+        lua-bitop            \
+        lua-cjson
 
 {% if CONFIGURED_ARCH == "armhf" %}
 # ip and ifconfig utility missing in docker for armhf
diff --git a/dockers/docker-orchagent/Dockerfile.j2 b/dockers/docker-orchagent/Dockerfile.j2
index f01bca7240..8a66e2adbe 100755
--- a/dockers/docker-orchagent/Dockerfile.j2
+++ b/dockers/docker-orchagent/Dockerfile.j2
@@ -18,13 +18,6 @@ RUN apt-get update &&       \
         iproute2            \
         ndisc6              \
         tcpdump             \
-        # Install redis-tools dependencies
-        # TODO: implicitly install dependencies
-        libatomic1          \
-        libjemalloc1        \
-        liblua5.1-0         \
-        lua-bitop           \
-        lua-cjson           \
         libelf1             \
         libmnl0             \
         bridge-utils
diff --git a/dockers/docker-sonic-telemetry/Dockerfile.j2 b/dockers/docker-sonic-telemetry/Dockerfile.j2
index 3a5716001c..e94441b4f0 100644
--- a/dockers/docker-sonic-telemetry/Dockerfile.j2
+++ b/dockers/docker-sonic-telemetry/Dockerfile.j2
@@ -11,14 +11,7 @@ RUN apt-get update      && \
     apt-get install -f -y  \
         libdbus-1-3        \
         libdaemon0         \
-        libjansson4        \
-        # Install redis-tools dependencies
-        # TODO: implicitly install dependencies
-        libatomic1          \
-        libjemalloc1        \
-        liblua5.1-0         \
-        lua-bitop           \
-        lua-cjson
+        libjansson4
 
 {% if docker_sonic_telemetry_debs.strip() -%}
 # Copy locally-built Debian package dependencies
diff --git a/dockers/docker-teamd/Dockerfile.j2 b/dockers/docker-teamd/Dockerfile.j2
index fc8626e772..4282a10d0c 100644
--- a/dockers/docker-teamd/Dockerfile.j2
+++ b/dockers/docker-teamd/Dockerfile.j2
@@ -12,14 +12,7 @@ RUN apt-get update      && \
         libdbus-1-3        \
         libdaemon0         \
         libjansson4        \
-        libpython2.7       \
-        # Install redis-tools dependencies
-        # TODO: implicitly install dependencies
-        libatomic1          \
-        libjemalloc1        \
-        liblua5.1-0         \
-        lua-bitop           \
-        lua-cjson
+        libpython2.7
 
 {% if docker_teamd_debs.strip() -%}
 # Copy locally-built Debian package dependencies
diff --git a/files/build_templates/docker_image_ctl.j2 b/files/build_templates/docker_image_ctl.j2
index c485254647..167a392730 100644
--- a/files/build_templates/docker_image_ctl.j2
+++ b/files/build_templates/docker_image_ctl.j2
@@ -149,6 +149,11 @@ function postStartAction()
             sonic-cfggen -j /etc/sonic/config_db.json --write-to-db
         fi
 
+        if [[ "$BOOT_TYPE" == "fast" ]]; then
+            # set the key to expire in 3 minutes
+            redis-cli -n 6 SET "FAST_REBOOT|system" "1" "EX" "180"
+        fi
+
         redis-cli -n 4 SET "CONFIG_DB_INITIALIZED" "1"
     fi
 
diff --git a/files/scripts/syncd.sh b/files/scripts/syncd.sh
index abcdb2e867..05e5552a64 100755
--- a/files/scripts/syncd.sh
+++ b/files/scripts/syncd.sh
@@ -64,7 +64,12 @@ function getBootType()
         TYPE='fastfast'
         ;;
     *SONIC_BOOT_TYPE=fast*|*fast-reboot*)
-        TYPE=$(awk '{ if ($1 <= 180) print "fast"; else print "cold" }' /proc/uptime)
+        # check that the key exists
+        if [[ $(redis-cli -n 6 GET "FAST_REBOOT|system") == "1" ]]; then
+            TYPE='fast'
+        else
+            TYPE='cold'
+        fi
         ;;
     *)
         TYPE='cold'
diff --git a/rules/docker-base-stretch.mk b/rules/docker-base-stretch.mk
index 55b7fd9f86..a54f4ec092 100644
--- a/rules/docker-base-stretch.mk
+++ b/rules/docker-base-stretch.mk
@@ -2,7 +2,7 @@
 
 DOCKER_BASE_STRETCH = docker-base-stretch.gz
 $(DOCKER_BASE_STRETCH)_PATH = $(DOCKERS_PATH)/docker-base-stretch
-$(DOCKER_BASE_STRETCH)_DEPENDS += $(SUPERVISOR)
+$(DOCKER_BASE_STRETCH)_DEPENDS += $(SUPERVISOR) $(REDIS_TOOLS)
 $(DOCKER_BASE_STRETCH)_DEPENDS += $(SOCAT)
 
 GDB = gdb
diff --git a/src/sonic-quagga b/src/sonic-quagga
index 904a350107..7101eeda1a 160000
--- a/src/sonic-quagga
+++ b/src/sonic-quagga
@@ -1 +1 @@
-Subproject commit 904a350107793d44be7167500fcec9087ca3243b
+Subproject commit 7101eeda1a1ccef2e951e4bea5a2f15d9a43e3b5