Skip to content

Commit 2818c7d

Browse files
committed
docker-sonic-vs: start portsyncd after syncd
Signed-off-by: securely1g <securely1g@users.noreply.github.com>
1 parent 95b0b14 commit 2818c7d

2 files changed

Lines changed: 8 additions & 1 deletion

File tree

dockers/docker-orchagent/supervisord.conf.common.j2

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@
2323
{% if include_swssconfig is not defined %}
2424
{% set include_swssconfig = true %}
2525
{% endif %}
26+
{% if portsyncd_dependent_startup_wait_for is not defined %}
27+
{% set portsyncd_dependent_startup_wait_for = "rsyslogd:running" %}
28+
{% endif %}
2629
{% if is_fabric_asic == 0 %}
2730
[program:gearsyncd]
2831
command=/usr/bin/gearsyncd -p /usr/share/sonic/hwsku/gearbox_config.json
@@ -53,7 +56,10 @@ stdout_syslog=true
5356
stderr_logfile=NONE
5457
stderr_syslog=true
5558
dependent_startup=true
56-
dependent_startup_wait_for=rsyslogd:running
59+
# portsyncd consumes CONFIG_DB port data. docker-sonic-vs start.sh loads
60+
# ConfigDB before starting syncd, so callers can wait for syncd to avoid
61+
# launching portsyncd early with an empty PORT table.
62+
dependent_startup_wait_for={{ portsyncd_dependent_startup_wait_for }}
5763
{% if ENABLE_ASAN == "y" %}
5864
environment=ASAN_OPTIONS="log_path=/var/log/asan/portsyncd-asan.log{{ asan_extra_options }}"
5965
{% endif %}

platform/vs/docker-sonic-vs/supervisord.conf.j2

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ stderr_syslog=true
8181
# SWSS programs (from docker-orchagent via _INCLUDE_DOCKER)
8282
{% set swss_priority_base = 5 %}
8383
{% set include_swssconfig = false %}
84+
{% set portsyncd_dependent_startup_wait_for = "syncd:running" %}
8485
{% include "supervisord.conf.swss.j2" %}
8586

8687
# Teamd programs (from docker-teamd via _INCLUDE_DOCKER)

0 commit comments

Comments
 (0)