Fix for additional intf flap during fast-reboot (#9166)

sonic-net · Nov 8, 2021 · 8544147 · 8544147
1 parent de3a928
commit 8544147
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/dockers/docker-orchagent/swssconfig.sh b/dockers/docker-orchagent/swssconfig.sh
@@ -23,6 +23,12 @@ function fast_reboot {
         mv -f /default_routes.json /default_routes.json.1
       fi
 
+      if [[ -f /media_config.json ]];
+      then
+        swssconfig /media_config.json
+        mv -f /media_config.json /media_config.json.1
+      fi
+
       ;;
     *)
       ;;

diff --git a/files/build_templates/docker_image_ctl.j2 b/files/build_templates/docker_image_ctl.j2
@@ -196,6 +196,7 @@ function postStartAction()
         test -e /host/fast-reboot/fdb.json && docker cp /host/fast-reboot/fdb.json swss$DEV:/
         test -e /host/fast-reboot/arp.json && docker cp /host/fast-reboot/arp.json swss$DEV:/
         test -e /host/fast-reboot/default_routes.json && docker cp /host/fast-reboot/default_routes.json swss$DEV:/
+        test -e /host/fast-reboot/media_config.json && docker cp /host/fast-reboot/media_config.json swss$DEV:/
         rm -fr /host/fast-reboot
     fi
     docker exec swss$DEV touch /ready # signal swssconfig.sh to go