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

[docker_image_ctl.j2]: swss docker initialization improvements (#17628) (#17680)

Browse Source
This commit is contained in:
mssonicbld 2024-01-05 04:39:16 +08:00 committed by GitHub
parent c5473c1d8b
commit ac4f6fcbc2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
files/build_templates/docker_image_ctl.j2
View File

@ -294,6 +294,12 @@ function postStartAction()
fi fi
chgrp -f redis $REDIS_SOCK && chmod -f 0760 $REDIS_SOCK chgrp -f redis $REDIS_SOCK && chmod -f 0760 $REDIS_SOCK
{%- elif docker_container_name == "swss" %} {%- elif docker_container_name == "swss" %}
# Wait until swss container state is Running
until [[ ($(docker inspect -f {{"'{{.State.Running}}'"}} swss$DEV) == "true") ]]; do
sleep 0.1
done
echo "swss container is up and running"
docker exec swss$DEV rm -f /ready # remove cruft docker exec swss$DEV rm -f /ready # remove cruft
if [[ "$BOOT_TYPE" == "fast" ]] && [[ -d /host/fast-reboot ]]; then if [[ "$BOOT_TYPE" == "fast" ]] && [[ -d /host/fast-reboot ]]; then
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:/
@ -303,6 +309,9 @@ function postStartAction()
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
# Re-confirm that file is indeed created and log an error if not
docker exec swss$DEV test -f /ready && echo "File swss:/ready created" || echo "Error: File swss:/ready doesn't exist"
{%- elif docker_container_name == "pmon" %} {%- elif docker_container_name == "pmon" %}
DEVPATH="/usr/share/sonic/device" DEVPATH="/usr/share/sonic/device"