matthew/sonic-buildimage
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
tjchadaga 2021-11-08 15:21:11 -08:00 committed by GitHub
parent de3a928c7c
commit 8544147a70
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dockers/docker-orchagent/swssconfig.sh
View File

@ -23,6 +23,12 @@ function fast_reboot {
mv -f /default_routes.json /default_routes.json.1 mv -f /default_routes.json /default_routes.json.1
fi fi
if [[ -f /media_config.json ]];
then
swssconfig /media_config.json
mv -f /media_config.json /media_config.json.1
fi
;; ;;
*) *)
;; ;;

1
files/build_templates/docker_image_ctl.j2
View File

@ -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/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/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/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 rm -fr /host/fast-reboot
fi fi
docker exec swss$DEV touch /ready # signal swssconfig.sh to go docker exec swss$DEV touch /ready # signal swssconfig.sh to go