2017-10-05 01:35:43 -05:00
|
|
|
[supervisord]
|
|
|
|
|
logfile_maxbytes=1MB
|
|
|
|
|
logfile_backups=2
|
|
|
|
|
nodaemon=true
|
|
|
|
|
|
2020-05-16 10:27:31 -05:00
|
|
|
[eventlistener:dependent-startup]
|
2020-11-20 01:41:32 -06:00
|
|
|
command=python3 -m supervisord_dependent_startup
|
2020-05-16 10:27:31 -05:00
|
|
|
autostart=true
|
|
|
|
|
autorestart=unexpected
|
|
|
|
|
startretries=0
|
|
|
|
|
exitcodes=0,3
|
|
|
|
|
events=PROCESS_STATE
|
[dockers][supervisor] Increase event buffer size for dependent-startup (#5247)
When stopping the swss, pmon or bgp containers, log messages like the following can be seen:
```
Aug 23 22:50:43.789760 sonic-dut INFO swss#supervisord 2020-08-23 22:50:10,061 ERRO pool dependent-startup event buffer overflowed, discarding event 34
Aug 23 22:50:43.789760 sonic-dut INFO swss#supervisord 2020-08-23 22:50:10,063 ERRO pool dependent-startup event buffer overflowed, discarding event 35
Aug 23 22:50:43.789760 sonic-dut INFO swss#supervisord 2020-08-23 22:50:10,064 ERRO pool dependent-startup event buffer overflowed, discarding event 36
Aug 23 22:50:43.789760 sonic-dut INFO swss#supervisord 2020-08-23 22:50:10,066 ERRO pool dependent-startup event buffer overflowed, discarding event 37
```
This is due to the number of programs in the container managed by supervisor, all generating events at the same time. The default event queue buffer size in supervisor is 10. This patch increases that value in all containers in order to eliminate these errors. As more programs are added to the containers, we may need to further adjust these values. I increased all buffer sizes to 25 except for containers with more programs or templated supervisor.conf files which allow for a variable number of programs. In these cases I increased the buffer size to 50. One final exception is the swss container, where the buffer fills up to ~50, so I increased this buffer to 100.
Resolves https://github.com/Azure/sonic-buildimage/issues/5241
2020-09-09 01:36:38 -05:00
|
|
|
buffer_size=50
|
2020-05-16 10:27:31 -05:00
|
|
|
|
2019-11-05 20:32:14 -06:00
|
|
|
[eventlistener:supervisor-proc-exit-listener]
|
2020-02-07 14:34:07 -06:00
|
|
|
command=/usr/bin/supervisor-proc-exit-listener --container-name dhcp_relay
|
[supervisord] Monitoring the critical processes with supervisord. (#6242)
- Why I did it
Initially, we used Monit to monitor critical processes in each container. If one of critical processes was not running
or crashed due to some reasons, then Monit will write an alerting message into syslog periodically. If we add a new process
in a container, the corresponding Monti configuration file will also need to update. It is a little hard for maintenance.
Currently we employed event listener of Supervisod to do this monitoring. Since processes in each container are managed by
Supervisord, we can only focus on the logic of monitoring.
- How I did it
We borrowed the event listener of Supervisord to monitor critical processes in containers. The event listener will take
following steps if it was notified one of critical processes exited unexpectedly:
The event listener will first check whether the auto-restart mechanism was enabled for this container or not. If auto-restart mechanism was enabled, event listener will kill the Supervisord process, which should cause the container to exit and subsequently get restarted.
If auto-restart mechanism was not enabled for this contianer, the event listener will enter a loop which will first sleep 1 minute and then check whether the process is running. If yes, the event listener exits. If no, an alerting message will be written into syslog.
- How to verify it
First, we need checked whether the auto-restart mechanism of a container was enabled or not by running the command show feature status. If enabled, one critical process should be selected and killed manually, then we need check whether the container will be restarted or not.
Second, we can disable the auto-restart mechanism if it was enabled at step 1 by running the commnad sudo config feature autorestart <container_name> disabled. Then one critical process should be selected and killed. After that, we will see the alerting message which will appear in the syslog every 1 minute.
- Which release branch to backport (provide reason below if selected)
201811
201911
[x ] 202006
2021-01-21 14:57:49 -06:00
|
|
|
events=PROCESS_STATE_EXITED,PROCESS_STATE_RUNNING
|
2019-11-05 20:32:14 -06:00
|
|
|
autostart=true
|
|
|
|
|
autorestart=unexpected
|
|
|
|
|
|
2020-05-16 10:27:31 -05:00
|
|
|
[program:rsyslogd]
|
|
|
|
|
command=/usr/sbin/rsyslogd -n -iNONE
|
2017-10-05 01:35:43 -05:00
|
|
|
priority=1
|
2020-05-16 10:27:31 -05:00
|
|
|
autostart=false
|
2017-10-05 01:35:43 -05:00
|
|
|
autorestart=false
|
|
|
|
|
stdout_logfile=syslog
|
|
|
|
|
stderr_logfile=syslog
|
2020-05-16 10:27:31 -05:00
|
|
|
dependent_startup=true
|
2017-10-05 01:35:43 -05:00
|
|
|
|
2020-05-16 10:27:31 -05:00
|
|
|
[program:start]
|
|
|
|
|
command=/usr/bin/start.sh
|
2017-10-05 01:35:43 -05:00
|
|
|
priority=2
|
|
|
|
|
autostart=false
|
|
|
|
|
autorestart=false
|
2020-05-16 10:27:31 -05:00
|
|
|
startsecs=0
|
2017-10-05 01:35:43 -05:00
|
|
|
stdout_logfile=syslog
|
|
|
|
|
stderr_logfile=syslog
|
2020-05-16 10:27:31 -05:00
|
|
|
dependent_startup=true
|
|
|
|
|
dependent_startup_wait_for=rsyslogd:running
|
2017-10-05 01:35:43 -05:00
|
|
|
|
|
|
|
|
{# If our configuration has VLANs... #}
|
2021-01-25 12:48:48 -06:00
|
|
|
{% if VLAN_INTERFACE %}
|
2017-10-05 01:35:43 -05:00
|
|
|
{# Count how many VLANs require a DHCP relay agent... #}
|
|
|
|
|
{% set num_relays = { 'count': 0 } %}
|
2021-01-25 12:48:48 -06:00
|
|
|
{% for vlan_name in VLAN_INTERFACE %}
|
2021-03-04 22:43:08 -06:00
|
|
|
{% if VLAN and vlan_name in VLAN and 'dhcp_servers' in VLAN[vlan_name] and VLAN[vlan_name]['dhcp_servers']|length > 0 %}
|
2017-10-05 01:35:43 -05:00
|
|
|
{% set _dummy = num_relays.update({'count': num_relays.count + 1}) %}
|
|
|
|
|
{% endif %}
|
|
|
|
|
{% endfor %}
|
|
|
|
|
{# If one or more of the VLANs require a DHCP relay agent... #}
|
|
|
|
|
{% if num_relays.count > 0 %}
|
|
|
|
|
[group:isc-dhcp-relay]
|
|
|
|
|
programs=
|
2019-06-03 16:26:45 -05:00
|
|
|
{%- set add_preceding_comma = { 'flag': False } %}
|
2021-01-25 12:48:48 -06:00
|
|
|
{% for vlan_name in VLAN_INTERFACE %}
|
2021-03-04 22:43:08 -06:00
|
|
|
{% if VLAN and vlan_name in VLAN and 'dhcp_servers' in VLAN[vlan_name] and VLAN[vlan_name]['dhcp_servers']|length > 0 %}
|
2019-06-03 16:26:45 -05:00
|
|
|
{% if add_preceding_comma.flag %},{% endif %}
|
|
|
|
|
{% set _dummy = add_preceding_comma.update({'flag': True}) %}
|
2017-10-05 01:35:43 -05:00
|
|
|
isc-dhcp-relay-{{ vlan_name }}
|
|
|
|
|
{%- endif %}
|
|
|
|
|
{% endfor %}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
{# Create a program entry for each DHCP relay agent instance #}
|
2019-09-06 14:01:08 -05:00
|
|
|
{% set relay_for_ipv4 = { 'flag': False } %}
|
2021-01-25 12:48:48 -06:00
|
|
|
{% for vlan_name in VLAN_INTERFACE %}
|
2021-03-04 22:43:08 -06:00
|
|
|
{% if VLAN and vlan_name in VLAN and 'dhcp_servers' in VLAN[vlan_name] and VLAN[vlan_name]['dhcp_servers']|length > 0 %}
|
2019-09-06 14:01:08 -05:00
|
|
|
{% for dhcp_server in VLAN[vlan_name]['dhcp_servers'] %}
|
|
|
|
|
{% if dhcp_server | ipv4 %}
|
|
|
|
|
{% set _dummy = relay_for_ipv4.update({'flag': True}) %}
|
|
|
|
|
{% endif %}
|
|
|
|
|
{% endfor %}
|
|
|
|
|
{% if relay_for_ipv4.flag %}
|
|
|
|
|
{% set _dummy = relay_for_ipv4.update({'flag': False}) %}
|
2017-10-05 01:35:43 -05:00
|
|
|
[program:isc-dhcp-relay-{{ vlan_name }}]
|
2019-06-03 16:26:45 -05:00
|
|
|
{# We treat this VLAN as a downstream interface (-id), as we only want to listen for requests #}
|
|
|
|
|
command=/usr/sbin/dhcrelay -d -m discard -a %%h:%%p %%P --name-alias-map-file /tmp/port-name-alias-map.txt -id {{ vlan_name }}
|
2020-12-09 20:10:00 -06:00
|
|
|
{#- Dual ToR Option #}
|
|
|
|
|
{% if 'subtype' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['subtype'] == 'DualToR' %} -U Loopback0 -dt{% endif -%}
|
2019-06-03 16:26:45 -05:00
|
|
|
{#- We treat all other interfaces as upstream interfaces (-iu), as we only want to listen for replies #}
|
2019-06-10 16:02:55 -05:00
|
|
|
{% for (name, prefix) in VLAN_INTERFACE|pfx_filter %}
|
2019-06-03 16:26:45 -05:00
|
|
|
{% if prefix | ipv4 and name != vlan_name %} -iu {{ name }}{% endif -%}
|
|
|
|
|
{% endfor %}
|
2019-06-10 16:02:55 -05:00
|
|
|
{% for (name, prefix) in INTERFACE|pfx_filter %}
|
2019-06-03 16:26:45 -05:00
|
|
|
{% if prefix | ipv4 %} -iu {{ name }}{% endif -%}
|
|
|
|
|
{% endfor %}
|
2019-06-10 16:02:55 -05:00
|
|
|
{% for (name, prefix) in PORTCHANNEL_INTERFACE|pfx_filter %}
|
2019-06-03 16:26:45 -05:00
|
|
|
{% if prefix | ipv4 %} -iu {{ name }}{% endif -%}
|
|
|
|
|
{% endfor %}
|
2019-09-06 14:01:08 -05:00
|
|
|
{% for dhcp_server in VLAN[vlan_name]['dhcp_servers'] %}
|
|
|
|
|
{%- if dhcp_server | ipv4 %} {{ dhcp_server }}{% endif -%}
|
|
|
|
|
{% endfor %}
|
2017-10-05 01:35:43 -05:00
|
|
|
|
|
|
|
|
priority=3
|
|
|
|
|
autostart=false
|
|
|
|
|
autorestart=false
|
|
|
|
|
stdout_logfile=syslog
|
|
|
|
|
stderr_logfile=syslog
|
2020-05-16 10:27:31 -05:00
|
|
|
dependent_startup=true
|
|
|
|
|
dependent_startup_wait_for=start:exited
|
2017-10-05 01:35:43 -05:00
|
|
|
|
2019-09-06 14:01:08 -05:00
|
|
|
{% endif %}
|
2017-10-05 01:35:43 -05:00
|
|
|
{% endif %}
|
|
|
|
|
{% endfor %}
|
2020-01-07 19:48:03 -06:00
|
|
|
|
|
|
|
|
[group:dhcpmon]
|
|
|
|
|
programs=
|
|
|
|
|
{%- set add_preceding_comma = { 'flag': False } %}
|
2021-01-25 12:48:48 -06:00
|
|
|
{% for vlan_name in VLAN_INTERFACE %}
|
2021-03-04 22:43:08 -06:00
|
|
|
{% if VLAN and vlan_name in VLAN and 'dhcp_servers' in VLAN[vlan_name] and VLAN[vlan_name]['dhcp_servers']|length > 0 %}
|
2020-01-07 19:48:03 -06:00
|
|
|
{% if add_preceding_comma.flag %},{% endif %}
|
|
|
|
|
{% set _dummy = add_preceding_comma.update({'flag': True}) %}
|
|
|
|
|
dhcpmon-{{ vlan_name }}
|
|
|
|
|
{%- endif %}
|
|
|
|
|
{% endfor %}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
{# Create a program entry for each DHCP MONitor instance #}
|
|
|
|
|
{% set relay_for_ipv4 = { 'flag': False } %}
|
2021-01-25 12:48:48 -06:00
|
|
|
{% for vlan_name in VLAN_INTERFACE %}
|
2021-03-04 22:43:08 -06:00
|
|
|
{% if VLAN and vlan_name in VLAN and 'dhcp_servers' in VLAN[vlan_name] and VLAN[vlan_name]['dhcp_servers']|length > 0 %}
|
2020-01-07 19:48:03 -06:00
|
|
|
{% for dhcp_server in VLAN[vlan_name]['dhcp_servers'] %}
|
|
|
|
|
{% if dhcp_server | ipv4 %}
|
|
|
|
|
{% set _dummy = relay_for_ipv4.update({'flag': True}) %}
|
|
|
|
|
{% endif %}
|
|
|
|
|
{% endfor %}
|
|
|
|
|
{% if relay_for_ipv4.flag %}
|
|
|
|
|
{% set _dummy = relay_for_ipv4.update({'flag': False}) %}
|
|
|
|
|
[program:dhcpmon-{{ vlan_name }}]
|
|
|
|
|
{# We treat this VLAN as a downstream interface (-id), as we only want to listen for requests #}
|
|
|
|
|
command=/usr/sbin/dhcpmon -id {{ vlan_name }}
|
|
|
|
|
{#- We treat all other interfaces as upstream interfaces (-iu), as we only want to listen for replies #}
|
|
|
|
|
{% for (name, prefix) in VLAN_INTERFACE|pfx_filter %}
|
|
|
|
|
{% if prefix | ipv4 and name != vlan_name %} -iu {{ name }}{% endif -%}
|
|
|
|
|
{% endfor %}
|
|
|
|
|
{% for (name, prefix) in INTERFACE|pfx_filter %}
|
|
|
|
|
{% if prefix | ipv4 %} -iu {{ name }}{% endif -%}
|
|
|
|
|
{% endfor %}
|
|
|
|
|
{% for (name, prefix) in PORTCHANNEL_INTERFACE|pfx_filter %}
|
|
|
|
|
{% if prefix | ipv4 %} -iu {{ name }}{% endif -%}
|
|
|
|
|
{% endfor %}
|
2020-09-09 20:37:01 -05:00
|
|
|
{% if MGMT_INTERFACE %}
|
|
|
|
|
{% for (name, prefix) in MGMT_INTERFACE|pfx_filter %}
|
2020-09-15 17:27:36 -05:00
|
|
|
{% if prefix | ipv4 %} -im {{ name }}{% endif -%}
|
2020-09-09 20:37:01 -05:00
|
|
|
{% endfor %}
|
|
|
|
|
{% endif %}
|
2020-01-07 19:48:03 -06:00
|
|
|
|
|
|
|
|
priority=4
|
|
|
|
|
autostart=false
|
|
|
|
|
autorestart=false
|
|
|
|
|
stdout_logfile=syslog
|
|
|
|
|
stderr_logfile=syslog
|
2020-05-16 10:27:31 -05:00
|
|
|
dependent_startup=true
|
|
|
|
|
dependent_startup_wait_for=isc-dhcp-relay-{{ vlan_name }}:running
|
2020-01-07 19:48:03 -06:00
|
|
|
|
|
|
|
|
{% endif %}
|
|
|
|
|
{% endif %}
|
|
|
|
|
{% endfor %}
|
|
|
|
|
|
2017-10-05 01:35:43 -05:00
|
|
|
{% endif %}
|
|
|
|
|
{% endif %}
|
