Skip to content

Commit 5b3b480

Browse files
authored
[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 #5241
1 parent d4fc8e5 commit 5b3b480

File tree

24 files changed

+24
-0
lines changed

24 files changed

+24
-0
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ autorestart=unexpected
1010
startretries=0
1111
exitcodes=0,3
1212
events=PROCESS_STATE
13+
buffer_size=50
1314

1415
[eventlistener:supervisor-proc-exit-listener]
1516
command=/usr/bin/supervisor-proc-exit-listener --container-name dhcp_relay

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ autorestart=unexpected
1010
startretries=0
1111
exitcodes=0,3
1212
events=PROCESS_STATE
13+
buffer_size=50
1314

1415
[eventlistener:supervisor-proc-exit-listener]
1516
command=/usr/bin/supervisor-proc-exit-listener --container-name bgp

dockers/docker-lldp/supervisord.conf.j2

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ autorestart=unexpected
1010
startretries=0
1111
exitcodes=0,3
1212
events=PROCESS_STATE
13+
buffer_size=25
1314

1415
[eventlistener:supervisor-proc-exit-listener]
1516
command=/usr/bin/supervisor-proc-exit-listener --container-name lldp

dockers/docker-nat/supervisord.conf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ autorestart=unexpected
1010
startretries=0
1111
exitcodes=0,3
1212
events=PROCESS_STATE
13+
buffer_size=25
1314

1415
[eventlistener:supervisor-proc-exit-listener]
1516
command=/usr/bin/supervisor-proc-exit-listener --container-name nat

dockers/docker-orchagent/supervisord.conf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ autorestart=unexpected
1010
startretries=0
1111
exitcodes=0,3
1212
events=PROCESS_STATE
13+
buffer_size=100
1314

1415
[eventlistener:supervisor-proc-exit-listener]
1516
command=/usr/bin/supervisor-proc-exit-listener --container-name swss

dockers/docker-platform-monitor/docker-pmon.supervisord.conf.j2

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ autorestart=unexpected
1010
startretries=0
1111
exitcodes=0,3
1212
events=PROCESS_STATE
13+
buffer_size=100
1314

1415
[eventlistener:supervisor-proc-exit-listener]
1516
command=/usr/bin/supervisor-proc-exit-listener --container-name pmon

dockers/docker-router-advertiser/docker-router-advertiser.supervisord.conf.j2

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ autorestart=unexpected
1010
startretries=0
1111
exitcodes=0,3
1212
events=PROCESS_STATE
13+
buffer_size=25
1314

1415
[eventlistener:supervisor-proc-exit-script]
1516
command=/usr/bin/supervisor-proc-exit-listener --container-name radv

dockers/docker-sflow/supervisord.conf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ autorestart=unexpected
1010
startretries=0
1111
exitcodes=0,3
1212
events=PROCESS_STATE
13+
buffer_size=25
1314

1415
[eventlistener:supervisor-proc-exit-listener]
1516
command=/usr/bin/supervisor-proc-exit-listener --container-name sflow

dockers/docker-snmp/supervisord.conf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ autorestart=unexpected
1010
startretries=0
1111
exitcodes=0,3
1212
events=PROCESS_STATE
13+
buffer_size=50
1314

1415
[eventlistener:supervisor-proc-exit-listener]
1516
command=/usr/bin/supervisor-proc-exit-listener --container-name snmp

dockers/docker-sonic-mgmt-framework/supervisord.conf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ autorestart=unexpected
1010
startretries=0
1111
exitcodes=0,3
1212
events=PROCESS_STATE
13+
buffer_size=25
1314

1415
[program:rsyslogd]
1516
command=/usr/sbin/rsyslogd -n -iNONE

0 commit comments

Comments
 (0)