From 8fb3a91a02f395c06b3610ad503370407fe6cd7a Mon Sep 17 00:00:00 2001
From: Ying Xie <ying.xie@microsoft.com>
Date: Thu, 6 Dec 2018 00:02:13 +0000
Subject: [PATCH 1/2] [update graph] adapt to warm reboot scenario

When migrating configuration, always copy config files from old_config
to /etc/sonic. But if warm reboot is detected, then skip configuration
operations.

Signed-off-by: Ying Xie <ying.xie@microsoft.com>
---
 files/image_config/updategraph/updategraph | 35 ++++++++++++++++------
 1 file changed, 26 insertions(+), 9 deletions(-)

diff --git a/files/image_config/updategraph/updategraph b/files/image_config/updategraph/updategraph
index 760c4c51d5..bf3a36a6a9 100755
--- a/files/image_config/updategraph/updategraph
+++ b/files/image_config/updategraph/updategraph
@@ -18,6 +18,26 @@ reload_minigraph()
     pfcwd start_default
 }
 
+function copy_config_files()
+{
+    for file in $@; do
+        if [ -f /etc/sonic/old_config/${file} ]; then
+            cp /etc/sonic/old_config/${file} /etc/sonic/
+        fi
+    done
+}
+
+function check_system_warm_boot()
+{
+    SYSTEM_WARM_START=`/usr/bin/redis-cli -n 4 hget "WARM_RESTART|system" enable`
+    # SYSTEM_WARM_START could be empty, always make WARM_BOOT meaningful.
+    if [[ x"$SYSTEM_WARM_START" == x"true" ]]; then
+        WARM_BOOT="true"
+    else
+        WARM_BOOT="false"
+    fi
+}
+
 
 if [ ! -f /etc/sonic/updategraph.conf ]; then
     echo "No updategraph.conf found, generating a default one."
@@ -26,21 +46,18 @@ fi
 
 . /etc/sonic/updategraph.conf
 
+check_system_warm_boot
+
 if [ -f /tmp/pending_config_migration ]; then
-    if [ "$enabled" = "true" ]; then
+    copy_config_files minigraph.xml snmp.yml acl.json config_db.json
+    if [ x"${WARM_BOOT}" == x"true" ]; then
+        echo "Warm reboot detected..."
+    elif [ "$enabled" = "true" ]; then
         echo "Use minigraph.xml from old system..."
-        cp /etc/sonic/old_config/minigraph.xml /etc/sonic/
-        if [ -f /etc/sonic/old_config/snmp.yml ]; then
-            cp /etc/sonic/old_config/snmp.yml /etc/sonic/
-        fi
-        if [ -f /etc/sonic/old_config/acl.json ]; then
-            cp /etc/sonic/old_config/acl.json /etc/sonic/
-        fi
         reload_minigraph
         sonic-cfggen -d --print-data > /etc/sonic/config_db.json
     else
         echo "Use config_db.json from old system..."
-        cp /etc/sonic/old_config/config_db.json /etc/sonic/
         sonic-cfggen -j /etc/sonic/config_db.json --write-to-db
     fi
     rm -f /tmp/pending_config_migration

From af95881c85815aeb32cc0949f6db6a22f489456d Mon Sep 17 00:00:00 2001
From: Ying Xie <ying.xie@microsoft.com>
Date: Thu, 6 Dec 2018 00:46:54 +0000
Subject: [PATCH 2/2] log file copies and misses

---
 files/image_config/updategraph/updategraph | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/files/image_config/updategraph/updategraph b/files/image_config/updategraph/updategraph
index bf3a36a6a9..63f788afc4 100755
--- a/files/image_config/updategraph/updategraph
+++ b/files/image_config/updategraph/updategraph
@@ -22,7 +22,10 @@ function copy_config_files()
 {
     for file in $@; do
         if [ -f /etc/sonic/old_config/${file} ]; then
+            logger "Copying SONiC configuration ${file} ..."
             cp /etc/sonic/old_config/${file} /etc/sonic/
+        else
+            logger "Missing SONiC configuration ${file} ..."
         fi
     done
 }