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

[Submodule update]: Update submodule sonic-utilities (#1407)

Browse Source 
* Update submodule sonic-utilities

* Copy fast-reboot json dumps from /host filesystem

* Update sonic-utilities to latest

* Fix typo
This commit is contained in:
pavel-shirshov 2018-02-26 11:23:29 -08:00 committed by GitHub
parent e18bffd105
commit ec537be065
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -29,6 +29,13 @@ function fast_reboot {
esac esac
} }
# Wait until swss.sh in the host system create file swss:/ready
until [[ -e /ready ]]; do
sleep 0.1;
done
rm -f /ready
# Restore FDB and ARP table ASAP # Restore FDB and ARP table ASAP
fast_reboot fast_reboot

19
files/build_templates/docker_image_ctl.j2
View File

@ -7,15 +7,24 @@ function getMountPoint()
function postStartAction() function postStartAction()
{ {
{%- if docker_container_name != "database" %} {%- if docker_container_name == "database" %}
:
{%- else %}
until [[ $(/usr/bin/docker exec database redis-cli ping | grep -c PONG) -gt 0 ]]; do until [[ $(/usr/bin/docker exec database redis-cli ping | grep -c PONG) -gt 0 ]]; do
sleep 1; sleep 1;
done done
{%- endif %} {%- elif docker_container_name == "swss" %}
{%- if docker_container_name == "snmp" %} docker exec swss rm -f /ready # remove cruft
if [[ -d /host/fast-reboot ]];
then
test -e /host/fast-reboot/fdb.json && docker cp /host/fast-reboot/fdb.json swss:/
test -e /host/fast-reboot/arp.json && docker cp /host/fast-reboot/arp.json swss:/
test -e /host/fast-reboot/default_routes.json && docker cp /host/fast-reboot/default_routes.json swss:/
rm -fr /host/fast-reboot
fi
docker exec swss touch /ready # signal swssconfig.sh to go
{%- elif docker_container_name == "snmp" %}
docker exec -i database redis-cli -n 6 HSET 'DEVICE_METADATA|localhost' chassis_serial_number $(decode-syseeprom -s) docker exec -i database redis-cli -n 6 HSET 'DEVICE_METADATA|localhost' chassis_serial_number $(decode-syseeprom -s)
{%- else %}
# nothing
{%- endif %} {%- endif %}
} }

2
src/sonic-utilities

@ -1 +1 @@
Subproject commit 05b910a5596714d16ae4ccf12d2b9c1099eaeccd Subproject commit 461470b0266b2408886e1d326d5d35f5b0616564