[syncd] skip ledinit during syncd warm start (#2285)

* [syncd] skip ledinit during syncd warm start Signed-off-by: Ying Xie <ying.xie@microsoft.com>
sonic-net · Nov 22, 2018 · 4abbe43 · 4abbe43
1 parent 873df9d
commit 4abbe43
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/files/scripts/syncd.sh b/files/scripts/syncd.sh
@@ -64,8 +64,13 @@ start() {
 
     debug "Warm boot flag: ${SERVICE} ${WARM_BOOT}."
 
-    # Don't flush DB during warm boot
-    if [[ x"$WARM_BOOT" != x"true" ]]; then
+    if [[ x"$WARM_BOOT" == x"true" ]]; then
+        # Leave a mark for syncd scripts running inside docker.
+        touch /host/warmboot/warm-starting
+    else
+        rm -f /host/warmboot/warm-starting
+
+        # Flush DB during non-warm start
         /usr/bin/docker exec database redis-cli -n 1 FLUSHDB
 
         # platform specific tasks

diff --git a/platform/broadcom/docker-syncd-brcm/start.sh b/platform/broadcom/docker-syncd-brcm/start.sh
@@ -39,7 +39,7 @@ fi
 supervisorctl start syncd
 
 # If this platform has an initialization file for the Broadcom LED microprocessor, load it
-if [ -r ${PLATFORM_DIR}/led_proc_init.soc ]; then
+if [ -r ${PLATFORM_DIR}/led_proc_init.soc && ! -f /var/warmboot/warm-starting ]; then
     wait_syncd
     supervisorctl start ledinit
 fi