From bd1d7a4ca45689a79bfcaeb4881d5ec79cbdb8c2 Mon Sep 17 00:00:00 2001
From: Pavel Shirshov <pavelsh@microsoft.com>
Date: Mon, 22 May 2017 18:32:53 -0700
Subject: [PATCH 1/2] Restore FDB and ARP entries right after fast reboot to
 minimize traffic corruption

---
 dockers/docker-orchagent/swssconfig.sh | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/dockers/docker-orchagent/swssconfig.sh b/dockers/docker-orchagent/swssconfig.sh
index f0f1e100f3d4..c0c61d01815c 100755
--- a/dockers/docker-orchagent/swssconfig.sh
+++ b/dockers/docker-orchagent/swssconfig.sh
@@ -12,6 +12,30 @@ function config_acl {
     fi
 }
 
+function fast_reboot {
+  case "$(cat /proc/cmdline)" in
+    *fast-reboot*)
+      if [[ -f /fdb.json ]];
+      then
+        swssconfig /fdb.json
+        rm -f /fdb.json
+      fi
+
+      if [[ -f /arp1.json ]];
+      then
+        swssconfig /arp1.json
+        rm -f /arp.json
+      fi
+      ;;
+    *)
+      ;;
+  esac
+}
+
+
+# Restore FDB and ARP table ASAP
+fast_reboot
+
 HWSKU=`sonic-cfggen -m /etc/sonic/minigraph.xml -v minigraph_hwsku`
 
 SWSSCONFIG_ARGS="00-copp.config.json ipinip.json mirror.json "

From 6a9543ce70b1021d0ae6e178f586dae94fcdddfd Mon Sep 17 00:00:00 2001
From: Pavel Shirshov <pavelsh@microsoft.com>
Date: Tue, 23 May 2017 12:02:18 -0700
Subject: [PATCH 2/2] Fix typo

---
 dockers/docker-orchagent/swssconfig.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dockers/docker-orchagent/swssconfig.sh b/dockers/docker-orchagent/swssconfig.sh
index c0c61d01815c..86ea010c2631 100755
--- a/dockers/docker-orchagent/swssconfig.sh
+++ b/dockers/docker-orchagent/swssconfig.sh
@@ -21,9 +21,9 @@ function fast_reboot {
         rm -f /fdb.json
       fi
 
-      if [[ -f /arp1.json ]];
+      if [[ -f /arp.json ]];
       then
-        swssconfig /arp1.json
+        swssconfig /arp.json
         rm -f /arp.json
       fi
       ;;