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

[scripts]: Fix issues with checking status of the DB. Use one approach everywhere. (#1323)

Browse Source
This commit is contained in:
pavel-shirshov 2018-01-18 19:55:11 -08:00 committed by lguohan
parent 163a0e2165
commit 8cfa223ef9
3 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
files/build_templates/docker_image_ctl.j2
View File

@ -10,11 +10,8 @@ function postStartAction()
{%- if docker_container_name != "database" %} {%- if docker_container_name != "database" %}
: :
{%- else %} {%- else %}
while true; do until [[ $(/usr/bin/docker exec database redis-cli ping | grep -c PONG) -gt 0 ]]; do
if [[ "$(docker exec -i database redis-cli ping)" =~ PONG.* ]]; then sleep 1;
break
fi
sleep 1
done done
{%- endif %} {%- endif %}
{%- if docker_container_name == "snmp" %} {%- if docker_container_name == "snmp" %}

2
files/build_templates/swss.service.j2
View File

@ -17,7 +17,7 @@ After=nps-modules-3.16.0-4-amd64.service
[Service] [Service]
User=root User=root
# Wait for redis server start before database clean # Wait for redis server start before database clean
ExecStartPre=/bin/bash -c "while true; do if [ \"$(/usr/bin/docker exec database redis-cli ping)\" == \"PONG\" ]; then break; fi; sleep 1; done" ExecStartPre=/bin/bash -c 'until [[ $(/usr/bin/docker exec database redis-cli ping | grep -c PONG) -gt 0 ]]; do sleep 1; done'
ExecStartPre=/usr/bin/docker exec database redis-cli -n 0 FLUSHDB ExecStartPre=/usr/bin/docker exec database redis-cli -n 0 FLUSHDB
ExecStartPre=/usr/bin/docker exec database redis-cli -n 1 FLUSHDB ExecStartPre=/usr/bin/docker exec database redis-cli -n 1 FLUSHDB
ExecStartPre=/usr/bin/docker exec database redis-cli -n 2 FLUSHDB ExecStartPre=/usr/bin/docker exec database redis-cli -n 2 FLUSHDB

7
files/scripts/configdb-load.sh
View File

@ -1,11 +1,8 @@
#!/usr/bin/env bash #!/usr/bin/env bash
# Wait until redis starts # Wait until redis starts
while true; do until [[ $(redis-cli ping | grep -c PONG) -gt 0 ]]; do
if [ `redis-cli ping` == "PONG" ]; then sleep 1;
break
fi
sleep 1
done done
# If there is a config db dump file, load it # If there is a config db dump file, load it