[pull] master from Azure:master

dockers/docker-base-buster/Dockerfile.j2

@@ -88,6 +88,9 @@ RUN apt-get -y purge   \
 {{ install_debian_packages(docker_base_buster_debs.split(' ')) }}
 {%- endif %}
 
+# Add support for supervisord to handle startup dependencies
+RUN pip install supervisord-dependent-startup==1.4.0
+
 # Clean up apt
 # Remove /var/lib/apt/lists/*, could be obsoleted for derived images
 RUN apt-get clean -y                     && \

dockers/docker-base-buster/etc/supervisor/supervisord.conf

@@ -3,8 +3,6 @@
 [unix_http_server]
 file=/var/run/supervisor.sock  ; (the path to the socket file)
 chmod=0700                     ; socket file mode (default 0700)
-username=dummy
-password=dummy
 
 [supervisord]
 logfile=/var/log/supervisor/supervisord.log  ; (main log file;default $CWD/supervisord.log)
@@ -20,8 +18,6 @@ supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
 
 [supervisorctl]
 serverurl=unix:///var/run/supervisor.sock  ; use a unix:// URL  for a unix socket
-username=dummy
-password=dummy
 
 ; The [include] section can just contain the "files" setting.  This
 ; setting can list multiple files (separated by whitespace or

dockers/docker-base-stretch/Dockerfile.j2

@@ -86,6 +86,9 @@ RUN apt-get -y purge   \
 {{ install_debian_packages(docker_base_stretch_debs.split(' ')) }}
 {%- endif %}
 
+# Add support for supervisord to handle startup dependencies
+RUN pip install supervisord-dependent-startup==1.4.0
+
 # Clean up apt
 # Remove /var/lib/apt/lists/*, could be obsoleted for derived images
 RUN apt-get clean -y                     && \

dockers/docker-base-stretch/etc/supervisor/supervisord.conf

@@ -3,8 +3,6 @@
 [unix_http_server]
 file=/var/run/supervisor.sock  ; (the path to the socket file)
 chmod=0700                     ; socket file mode (default 0700)
-username=dummy
-password=dummy
 
 [supervisord]
 logfile=/var/log/supervisor/supervisord.log  ; (main log file;default $CWD/supervisord.log)
@@ -20,8 +18,6 @@ supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
 
 [supervisorctl]
 serverurl=unix:///var/run/supervisor.sock  ; use a unix:// URL  for a unix socket
-username=dummy
-password=dummy
 
 ; The [include] section can just contain the "files" setting.  This
 ; setting can list multiple files (separated by whitespace or

dockers/docker-database/supervisord.conf.j2

@@ -10,7 +10,7 @@ autostart=true
 autorestart=unexpected
 
 [program:rsyslogd]
-command=/bin/bash -c "rm -f /var/run/rsyslogd.pid && /usr/sbin/rsyslogd -n"
+command=/usr/sbin/rsyslogd -n -iNONE
 priority=1
 autostart=true
 autorestart=false

dockers/docker-dhcp-relay/docker-dhcp-relay.supervisord.conf.j2

@@ -3,27 +3,39 @@ logfile_maxbytes=1MB
 logfile_backups=2
 nodaemon=true
 
+[eventlistener:dependent-startup]
+command=python -m supervisord_dependent_startup
+autostart=true
+autorestart=unexpected
+startretries=0
+exitcodes=0,3
+events=PROCESS_STATE
+
 [eventlistener:supervisor-proc-exit-listener]
 command=/usr/bin/supervisor-proc-exit-listener --container-name dhcp_relay
 events=PROCESS_STATE_EXITED
 autostart=true
 autorestart=unexpected
 
-[program:start.sh]
-command=/usr/bin/start.sh
+[program:rsyslogd]
+command=/usr/sbin/rsyslogd -n -iNONE
 priority=1
-autostart=true
+autostart=false
 autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
+dependent_startup=true
 
-[program:rsyslogd]
-command=/usr/sbin/rsyslogd -n
+[program:start]
+command=/usr/bin/start.sh
 priority=2
 autostart=false
 autorestart=false
+startsecs=0
 stdout_logfile=syslog
 stderr_logfile=syslog
+dependent_startup=true
+dependent_startup_wait_for=rsyslogd:running
 
 {# If our configuration has VLANs... #}
 {% if VLAN %}
@@ -81,6 +93,8 @@ autostart=false
 autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
+dependent_startup=true
+dependent_startup_wait_for=start:exited
 
 {% endif %}
 {% endif %}
@@ -128,6 +142,8 @@ autostart=false
 autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
+dependent_startup=true
+dependent_startup_wait_for=isc-dhcp-relay-{{ vlan_name }}:running
 
 {% endif %}
 {% endif %}

dockers/docker-dhcp-relay/start.sh

@@ -1,11 +1,5 @@
 #!/usr/bin/env bash
 
-# Remove stale rsyslog PID file if it exists
-rm -f /var/run/rsyslogd.pid
-
-# Start rsyslog
-supervisorctl start rsyslogd
-
 # If our supervisor config has entries in the "isc-dhcp-relay" group...
 if [ $(supervisorctl status | grep -c "^isc-dhcp-relay:") -gt 0 ]; then
     # Wait for all interfaces to come up and be assigned IPv4 addresses before
@@ -15,13 +9,4 @@ if [ $(supervisorctl status | grep -c "^isc-dhcp-relay:") -gt 0 ]; then
     # relay agent starts, it will not listen or send on that interface for the
     # lifetime of the process.
     /usr/bin/wait_for_intf.sh
-
-    # Start all DHCP relay agent(s)
-    supervisorctl start isc-dhcp-relay:*
-fi
-
-# If our supervisor config has entries in the "dhcpmon" group...
-if [ $(supervisorctl status | grep -c "^dhcpmon:") -gt 0 ]; then
-    # Start all DHCP Monitor daemon(s)
-    supervisorctl start dhcpmon:*
 fi

dockers/docker-fpm-frr/Dockerfile.j2

@@ -40,8 +40,7 @@ RUN apt-get clean -y      && \
     rm -rf /debs ~/.cache
 
 COPY ["frr", "/usr/share/sonic/templates"]
-COPY ["bgpcfgd", "start.sh", "/usr/bin/"]
-COPY ["supervisord.conf", "/etc/supervisor/conf.d/"]
+COPY ["bgpcfgd", "docker_init.sh", "/usr/bin/"]
 COPY ["snmp.conf", "/etc/snmp/frr.conf"]
 COPY ["TSA", "/usr/bin/TSA"]
 COPY ["TSB", "/usr/bin/TSB"]
@@ -52,4 +51,4 @@ RUN chmod a+x /usr/bin/TSA && \
     chmod a+x /usr/bin/TSB && \
     chmod a+x /usr/bin/TSC
 
-ENTRYPOINT ["/usr/bin/supervisord"]
+ENTRYPOINT ["/usr/bin/docker_init.sh"]

dockers/docker-fpm-frr/start.sh → dockers/docker-fpm-frr/docker_init.sh

@@ -1,9 +1,11 @@
 #!/usr/bin/env bash
 
 mkdir -p /etc/frr
+mkdir -p /etc/supervisor/conf.d
 
-CONFIG_TYPE=`sonic-cfggen -d -v 'DEVICE_METADATA["localhost"]["docker_routing_config_mode"]'`
+sonic-cfggen -d -t /usr/share/sonic/templates/supervisord/supervisord.conf.j2 > /etc/supervisor/conf.d/supervisord.conf
 
+CONFIG_TYPE=`sonic-cfggen -d -v 'DEVICE_METADATA["localhost"]["docker_routing_config_mode"]'`
 if [ -z "$CONFIG_TYPE" ] || [ "$CONFIG_TYPE" == "separated" ]; then
     sonic-cfggen -d -t /usr/share/sonic/templates/bgpd/bgpd.conf.j2 -y /etc/sonic/constants.yml > /etc/frr/bgpd.conf
     sonic-cfggen -d -t /usr/share/sonic/templates/zebra/zebra.conf.j2 > /etc/frr/zebra.conf
@@ -29,24 +31,4 @@ chmod 0755 /usr/sbin/bgp-unisolate
 mkdir -p /var/sonic
 echo "# Config files managed by sonic-config-engine" > /var/sonic/config_status
 
-rm -f /var/run/rsyslogd.pid
-
-supervisorctl start rsyslogd
-
-# start eoiu pulling, only if configured so
-if [[ $(sonic-cfggen -d -v 'WARM_RESTART.bgp.bgp_eoiu') == 'true' ]]; then
-    supervisorctl start bgp_eoiu_marker
-fi
-
-# Start Quagga processes
-supervisorctl start zebra
-supervisorctl start staticd
-supervisorctl start bgpd
-
-if [ "$CONFIG_TYPE" == "unified" ]; then
-    supervisorctl start vtysh_b
-fi
-
-supervisorctl start fpmsyncd
-
-supervisorctl start bgpcfgd
+exec /usr/bin/supervisord

dockers/docker-fpm-frr/supervisord.conf → dockers/docker-fpm-frr/frr/supervisord/supervisord.conf.j2

@@ -3,38 +3,29 @@ logfile_maxbytes=1MB
 logfile_backups=2
 nodaemon=true
 
+[eventlistener:dependent-startup]
+command=python -m supervisord_dependent_startup
+autostart=true
+autorestart=unexpected
+startretries=0
+exitcodes=0,3
+events=PROCESS_STATE
+
 [eventlistener:supervisor-proc-exit-listener]
 command=/usr/bin/supervisor-proc-exit-listener --container-name bgp
 events=PROCESS_STATE_EXITED
 autostart=true
 autorestart=unexpected
 
-[program:start.sh]
-command=/usr/bin/start.sh
-priority=1
-autostart=true
-autorestart=false
-startsecs=0
-stdout_logfile=syslog
-stderr_logfile=syslog
-
-[program:bgpcfgd]
-command=/usr/bin/bgpcfgd
-priority=2
-autostart=false
-autorestart=false
-startsecs=0
-stdout_logfile=syslog
-stderr_logfile=syslog
-
 [program:rsyslogd]
-command=/usr/sbin/rsyslogd -n
-priority=3
+command=/usr/sbin/rsyslogd -n -iNONE
+priority=1
 autostart=false
 autorestart=unexpected
 startsecs=0
 stdout_logfile=syslog
 stderr_logfile=syslog
+dependent_startup=true
 
 [program:zebra]
 command=/usr/lib/frr/zebra -A 127.0.0.1 -s 90000000 -M fpm -M snmp
@@ -44,6 +35,8 @@ autorestart=false
 startsecs=0
 stdout_logfile=syslog
 stderr_logfile=syslog
+dependent_startup=true
+dependent_startup_wait_for=rsyslogd:running
 
 [program:staticd]
 command=/usr/lib/frr/staticd -A 127.0.0.1
@@ -53,6 +46,8 @@ autorestart=false
 startsecs=0
 stdout_logfile=syslog
 stderr_logfile=syslog
+dependent_startup=true
+dependent_startup_wait_for=rsyslogd:running
 
 [program:bgpd]
 command=/usr/lib/frr/bgpd -A 127.0.0.1 -M snmp
@@ -63,25 +58,45 @@ autorestart=false
 startsecs=0
 stdout_logfile=syslog
 stderr_logfile=syslog
+dependent_startup=true
+dependent_startup_wait_for=rsyslogd:running
 
-[program:vtysh_b]
-command=/usr/bin/vtysh -b
+[program:fpmsyncd]
+command=fpmsyncd
 priority=6
 autostart=false
 autorestart=false
 startsecs=0
 stdout_logfile=syslog
 stderr_logfile=syslog
+dependent_startup=true
+dependent_startup_wait_for=bgpd:running
 
-[program:fpmsyncd]
-command=fpmsyncd
+[program:bgpcfgd]
+command=/usr/bin/bgpcfgd
+priority=6
+autostart=false
+autorestart=false
+startsecs=0
+stdout_logfile=syslog
+stderr_logfile=syslog
+dependent_startup=true
+dependent_startup_wait_for=bgpd:running
+
+{% if DEVICE_METADATA.localhost.docker_routing_config_mode is defined and DEVICE_METADATA.localhost.docker_routing_config_mode == "unified" %}
+[program:vtysh_b]
+command=/usr/bin/vtysh -b
 priority=6
 autostart=false
 autorestart=false
 startsecs=0
 stdout_logfile=syslog
 stderr_logfile=syslog
+dependent_startup=true
+dependent_startup_wait_for=rsyslogd:running
+{% endif %}
 
+{% if WARM_RESTART is defined and WARM_RESTART.bgp is defined and WARM_RESTART.bgp.bgp_eoiu is defined and WARM_RESTART.bgp.bgp_eoiu == "true" %}
 [program:bgp_eoiu_marker]
 command=/usr/bin/bgp_eoiu_marker.py
 priority=7
@@ -91,3 +106,6 @@ startsecs=0
 startretries=0
 stdout_logfile=syslog
 stderr_logfile=syslog
+dependent_startup=true
+dependent_startup_wait_for=rsyslogd:running
+{% endif %}

dockers/docker-iccpd/start.sh

@@ -10,9 +10,3 @@ sonic-cfggen -d -t /usr/share/sonic/templates/iccpd.j2 > $ICCPD_CONF_PATH/iccpd.
 
 mkdir -p /var/sonic
 echo "# Config files managed by sonic-config-engine" > /var/sonic/config_status
-
-rm -f /var/run/rsyslogd.pid
-
-supervisorctl start rsyslogd
-
-supervisorctl start iccpd

dockers/docker-iccpd/supervisord.conf

@@ -3,21 +3,33 @@ logfile_maxbytes=1MB
 logfile_backups=2
 nodaemon=true
 
-[program:start.sh]
-command=/usr/bin/start.sh
-priority=1
+[eventlistener:dependent-startup]
+command=python -m supervisord_dependent_startup
 autostart=true
+autorestart=unexpected
+startretries=0
+exitcodes=0,3
+events=PROCESS_STATE
+
+[program:rsyslogd]
+command=/usr/sbin/rsyslogd -n -iNONE
+priority=1
+autostart=false
 autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
+dependent_startup=true
 
-[program:rsyslogd]
-command=/usr/sbin/rsyslogd -n
+[program:start]
+command=/usr/bin/start.sh
 priority=2
 autostart=false
 autorestart=false
+startsecs=0
 stdout_logfile=syslog
 stderr_logfile=syslog
+dependent_startup=true
+dependent_startup_wait_for=rsyslogd:running
 
 [program:iccpd]
 command=/usr/bin/iccpd.sh
@@ -26,4 +38,5 @@ autostart=false
 autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
-
+dependent_startup=true
+dependent_startup_wait_for=start:exited

dockers/docker-lldp-sv2/Dockerfile.j2

@@ -37,6 +37,7 @@ RUN apt-get purge -y python-pip && \
 
 COPY ["docker-lldp-init.sh", "/usr/bin/"]
 COPY ["start.sh", "/usr/bin/"]
+COPY ["waitfor_lldp_ready.sh", "/usr/bin/"]
 COPY ["supervisord.conf.j2", "/usr/share/sonic/templates/"]
 COPY ["lldpd.conf.j2", "/usr/share/sonic/templates/"]
 COPY ["lldpd", "/etc/default/"]