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

[docker-orchagent]: start portsyncd before orchagent (#4845)

Browse Source 
when portsyncd starts, it first enumerates all front panel ports
and marks them as old interfaces. Then, for new front panel ports
it checks if their indexes exist in previous sets. If yes, it will
treats them as old interfaces and ignore them.

The reason we have this check is because broadcom SAI only removes
front panel ports after sai switch init.

So, if portsyncd starts after orchagent, new interfaces could be
created before portsyncd and treated as old interface.

Signed-off-by: Guohan Lu <lguohan@gmail.com>
This commit is contained in:
lguohan 2020-06-24 22:48:37 -07:00 committed by GitHub
parent 63d2efbe03
commit cebb85b161
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
dockers/docker-orchagent/supervisord.conf
View File

@ -26,8 +26,8 @@ stdout_logfile=syslog
stderr_logfile=syslog stderr_logfile=syslog
dependent_startup=true dependent_startup=true
[program:orchagent] [program:portsyncd]
command=/usr/bin/orchagent.sh command=/usr/bin/portsyncd
priority=3 priority=3
autostart=false autostart=false
autorestart=false autorestart=false
@ -36,9 +36,19 @@ stderr_logfile=syslog
dependent_startup=true dependent_startup=true
dependent_startup_wait_for=rsyslogd:running dependent_startup_wait_for=rsyslogd:running
[program:orchagent]
command=/usr/bin/orchagent.sh
priority=4
autostart=false
autorestart=false
stdout_logfile=syslog
stderr_logfile=syslog
dependent_startup=true
dependent_startup_wait_for=portsyncd:running
[program:restore_neighbors] [program:restore_neighbors]
command=/usr/bin/restore_neighbors.py command=/usr/bin/restore_neighbors.py
priority=4 priority=5
autostart=false autostart=false
autorestart=false autorestart=false
startsecs=0 startsecs=0
@ -60,19 +70,9 @@ stderr_logfile=syslog
dependent_startup=true dependent_startup=true
dependent_startup_wait_for=orchagent:running dependent_startup_wait_for=orchagent:running
[program:portsyncd]
command=/usr/bin/portsyncd
priority=4
autostart=false
autorestart=false
stdout_logfile=syslog
stderr_logfile=syslog
dependent_startup=true
dependent_startup_wait_for=swssconfig:exited
[program:neighsyncd] [program:neighsyncd]
command=/usr/bin/neighsyncd command=/usr/bin/neighsyncd
priority=5 priority=7
autostart=false autostart=false
autorestart=false autorestart=false
stdout_logfile=syslog stdout_logfile=syslog