Skip to content

Add support to start fdbsyncd when swss docker starts #5979

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 25, 2020
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions dockers/docker-orchagent/base_image_files/monit_swss
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
## orchagent
## portsyncd
## neighsyncd
## fdbsyncd
## vrfmgrd
## vlanmgrd
## intfmgrd
Expand All @@ -21,6 +22,9 @@ check program swss|portsyncd with path "/usr/bin/process_checker swss /usr/bin/p
check program swss|neighsyncd with path "/usr/bin/process_checker swss /usr/bin/neighsyncd"
if status != 0 for 5 times within 5 cycles then alert repeat every 1 cycles

check program swss|fdbsyncd with path "/usr/bin/process_checker swss /usr/bin/fdbsyncd"
if status != 0 for 5 times within 5 cycles then alert repeat every 1 cycles

check program swss|vrfmgrd with path "/usr/bin/process_checker swss /usr/bin/vrfmgrd"
if status != 0 for 5 times within 5 cycles then alert repeat every 1 cycles

Expand Down
1 change: 1 addition & 0 deletions dockers/docker-orchagent/critical_processes
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
program:orchagent
program:portsyncd
program:neighsyncd
program:fdbsyncd
program:vlanmgrd
program:intfmgrd
program:portmgrd
Expand Down
11 changes: 11 additions & 0 deletions dockers/docker-orchagent/supervisord.conf
Original file line number Diff line number Diff line change
Expand Up @@ -172,3 +172,14 @@ stdout_logfile=syslog
stderr_logfile=syslog
dependent_startup=true
dependent_startup_wait_for=swssconfig:exited

[program:fdbsyncd]
command=/usr/bin/fdbsyncd
priority=17
autostart=false
autorestart=false
stdout_logfile=syslog
stderr_logfile=syslog
dependent_startup=true
dependent_startup_wait_for=swssconfig:exited

3 changes: 3 additions & 0 deletions platform/p4/docker-sonic-p4/start.sh
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,9 @@ supervisorctl start portsyncd
echo "Start neighsyncd"
supervisorctl start neighsyncd

echo "Start fdbsyncd"
supervisorctl start fdbsyncd

echo "Start teamsyncd"
supervisorctl start teamsyncd

Expand Down
8 changes: 8 additions & 0 deletions platform/p4/docker-sonic-p4/supervisord.conf
Original file line number Diff line number Diff line change
Expand Up @@ -131,3 +131,11 @@ autostart=false
autorestart=unexpected
stdout_logfile=syslog
stderr_logfile=syslog

[program:fdbsyncd]
command=/usr/bin/fdbsyncd
priority=16
autostart=false
autorestart=false
stdout_logfile=syslog
stderr_logfile=syslog
2 changes: 2 additions & 0 deletions platform/vs/docker-sonic-vs/start.sh
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,8 @@ supervisorctl start orchagent

supervisorctl start neighsyncd

supervisorctl start fdbsyncd

supervisorctl start teamsyncd

supervisorctl start fpmsyncd
Expand Down
9 changes: 9 additions & 0 deletions platform/vs/docker-sonic-vs/supervisord.conf
Original file line number Diff line number Diff line change
Expand Up @@ -212,3 +212,12 @@ autostart=false
autorestart=false
stdout_logfile=syslog
stderr_logfile=syslog

[program:fdbsyncd]
command=/usr/bin/fdbsyncd
priority=25
autostart=false
autorestart=false
stdout_logfile=syslog
stderr_logfile=syslog