Skip to content

Commit a2ab261

Browse files
Vitaliy Senchyshynlguohan
Vitaliy Senchyshyn
authored andcommitted
Fixes problems with database - swss - syncd synchronization. (#110)
* [syncd.service] Make syncd starting after swss in order to eliminate race condition with database flush/set * [swss.service] Make swss waiting for redis server start before cleaning the database * Fixed review comments for changes in swss service file
1 parent 12b4aeb commit a2ab261

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

ansible/roles/sonicv2/templates/etc/systemd/system/swss.j2

+2
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ After=database.service
55

66
[Service]
77
User={{ sonicadmin_user }}
8+
# Wait for redis server start before database clean
9+
ExecStartPre=/bin/bash -c "while true; do if [ \"$(/usr/bin/docker exec database redis-cli ping)\" == \"PONG\" ]; then break; fi; sleep 1; done"
810
ExecStartPre=/usr/bin/docker exec database redis-cli -n 0 FLUSHDB
911
ExecStartPre=/usr/bin/docker exec database redis-cli -n 1 FLUSHDB
1012
ExecStartPre=/usr/bin/docker exec database redis-cli -n 2 FLUSHDB

ansible/roles/sonicv2/templates/etc/systemd/system/syncd.j2

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[Unit]
22
Description=syncd container
3-
Requires=database.service
4-
After=database.service
3+
Requires=database.service swss.service
4+
After=database.service swss.service
55

66
[Service]
77
User=root

0 commit comments

Comments
 (0)