matthew/sonic-buildimage
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
5c31f6d8cc
sonic-buildimage/dockers/docker-orchagent/supervisord.conf

208 lines
4.2 KiB
Plaintext
Raw Normal View History

[Dockers]: Manage all Docker containers with Supervisord (#573) - Consolidate config.sh and start.sh scripts into one script (start.sh) - Solve issue #435 - All dockers now run supervisord as their ENTRYPOINT - All stdout/stderr output from processes managed by supervisord is now sent to syslog instead of their own files - Supervisord log messages are now also sent to syslog - Removed unused smartmontools package from docker-platform-monitor
2017-05-08 17:43:31 -05:00
[supervisord]
logfile_maxbytes=1MB
logfile_backups=2
nodaemon=true
[docker-orchagent]: use service dependency in supervisord to start services
2020-05-15 19:09:16 -05:00
[eventlistener:dependent-startup]
[supervisor] Install vanilla package once again, install Python 3 version in Buster container (#5546) **- Why I did it** We were building a custom version of Supervisor because I had added patches to prevent hangs and crashes if the system clock ever rolled backward. Those changes were merged into the upstream Supervisor repo as of version 3.4.0 (http://supervisord.org/changes.html#id9), therefore, we should be able to simply install the vanilla package via pip. This will also allow us to easily move to Python 3, as Python 3 support was added in version 4.0.0. **- How I did it** - Remove Makefiles and patches for building supervisor package from source - Install Python 3 supervisor package version 4.2.1 in Buster base container - Also install Python 3 version of supervisord-dependent-startup in Buster base container - Debian package installed binary in `/usr/bin/`, but pip package installs in `/usr/local/bin/`, so rather than update all absolute paths, I changed all references to simply call `supervisord` and let the system PATH find the executable to prevent future need for changes just in case we ever need to switch back to build a Debian package, then we won't need to modify these again. - Install Python 2 supervisor package >= 3.4.0 in Stretch and Jessie base containers
2020-11-20 01:41:32 -06:00
command=python3 -m supervisord_dependent_startup
[docker-orchagent]: use service dependency in supervisord to start services
2020-05-15 19:09:16 -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=100
[docker-orchagent]: use service dependency in supervisord to start services
2020-05-15 19:09:16 -05:00
[services] Restart SwSS service upon unexpected critical process exit (#2845) * [service] Restart SwSS Docker container if orchagent exits unexpectedly * Configure systemd to stop restarting swss if it attempts to restart more than 3 times in 20 minutes * Move supervisor-proc-exit-listener script * [docker-dhcp-relay] Enhance wait_for_intf.sh.j2 to utilize STATEDB * Ensure dependent services stop/start/restart with SwSS * Change 'StartLimitInterval' to 'StartLimitIntervalSec', as Stretch installs systemd 232 (>= v230) * Also update journald.conf options * Remove 'PartOf' option from unit files * Add '$(SUPERVISOR_PROC_EXIT_LISTENER_SCRIPT)' to new shared docker-orchagent makefile * Make supervisor-proc-exit-listener script read from 'critical_processes' file inside container * Update critical_processes file for swss container
2019-05-01 10:02:38 -05:00
[eventlistener:supervisor-proc-exit-listener]
[Service] Enable/disable container auto-restart based on configuration. (#4073)
2020-02-07 14:34:07 -06:00
command=/usr/bin/supervisor-proc-exit-listener --container-name swss
[services] Restart SwSS service upon unexpected critical process exit (#2845) * [service] Restart SwSS Docker container if orchagent exits unexpectedly * Configure systemd to stop restarting swss if it attempts to restart more than 3 times in 20 minutes * Move supervisor-proc-exit-listener script * [docker-dhcp-relay] Enhance wait_for_intf.sh.j2 to utilize STATEDB * Ensure dependent services stop/start/restart with SwSS * Change 'StartLimitInterval' to 'StartLimitIntervalSec', as Stretch installs systemd 232 (>= v230) * Also update journald.conf options * Remove 'PartOf' option from unit files * Add '$(SUPERVISOR_PROC_EXIT_LISTENER_SCRIPT)' to new shared docker-orchagent makefile * Make supervisor-proc-exit-listener script read from 'critical_processes' file inside container * Update critical_processes file for swss container
2019-05-01 10:02:38 -05:00
events=PROCESS_STATE_EXITED
autostart=true
autorestart=unexpected
[Dockers]: Manage all Docker containers with Supervisord (#573) - Consolidate config.sh and start.sh scripts into one script (start.sh) - Solve issue #435 - All dockers now run supervisord as their ENTRYPOINT - All stdout/stderr output from processes managed by supervisord is now sent to syslog instead of their own files - Supervisord log messages are now also sent to syslog - Removed unused smartmontools package from docker-platform-monitor
2017-05-08 17:43:31 -05:00
[program:rsyslogd]
[docker-orchagent]: use service dependency in supervisord to start services
2020-05-15 19:09:16 -05:00
command=/usr/sbin/rsyslogd -n -iNONE
priority=1
[Dockers]: Manage all Docker containers with Supervisord (#573) - Consolidate config.sh and start.sh scripts into one script (start.sh) - Solve issue #435 - All dockers now run supervisord as their ENTRYPOINT - All stdout/stderr output from processes managed by supervisord is now sent to syslog instead of their own files - Supervisord log messages are now also sent to syslog - Removed unused smartmontools package from docker-platform-monitor
2017-05-08 17:43:31 -05:00
autostart=false
[services] Restart SwSS service upon unexpected critical process exit (#2845) * [service] Restart SwSS Docker container if orchagent exits unexpectedly * Configure systemd to stop restarting swss if it attempts to restart more than 3 times in 20 minutes * Move supervisor-proc-exit-listener script * [docker-dhcp-relay] Enhance wait_for_intf.sh.j2 to utilize STATEDB * Ensure dependent services stop/start/restart with SwSS * Change 'StartLimitInterval' to 'StartLimitIntervalSec', as Stretch installs systemd 232 (>= v230) * Also update journald.conf options * Remove 'PartOf' option from unit files * Add '$(SUPERVISOR_PROC_EXIT_LISTENER_SCRIPT)' to new shared docker-orchagent makefile * Make supervisor-proc-exit-listener script read from 'critical_processes' file inside container * Update critical_processes file for swss container
2019-05-01 10:02:38 -05:00
autorestart=unexpected
[Dockers]: Manage all Docker containers with Supervisord (#573) - Consolidate config.sh and start.sh scripts into one script (start.sh) - Solve issue #435 - All dockers now run supervisord as their ENTRYPOINT - All stdout/stderr output from processes managed by supervisord is now sent to syslog instead of their own files - Supervisord log messages are now also sent to syslog - Removed unused smartmontools package from docker-platform-monitor
2017-05-08 17:43:31 -05:00
stdout_logfile=syslog
stderr_logfile=syslog
[docker-orchagent]: use service dependency in supervisord to start services
2020-05-15 19:09:16 -05:00
dependent_startup=true
[Dockers]: Manage all Docker containers with Supervisord (#573) - Consolidate config.sh and start.sh scripts into one script (start.sh) - Solve issue #435 - All dockers now run supervisord as their ENTRYPOINT - All stdout/stderr output from processes managed by supervisord is now sent to syslog instead of their own files - Supervisord log messages are now also sent to syslog - Removed unused smartmontools package from docker-platform-monitor
2017-05-08 17:43:31 -05:00
Add gearbox phy device files and a new physyncd docker to support VS gearbox phy feature (#4851) * buildimage: Add gearbox phy device files and a new physyncd docker to support VS gearbox phy feature * scripts and configuration needed to support a second syncd docker (physyncd) * physyncd supports gearbox device and phy SAI APIs and runs multiple instances of syncd, one per phy in the device * support for VS target (sonic-sairedis vslib has been extended to support a virtual BCM81724 gearbox PHY). HLD is located at https://github.com/Azure/SONiC/blob/b817a12fd89520d3fd26bbc5897487928e7f6de7/doc/gearbox/gearbox_mgr_design.md **- Why I did it** This work is part of the gearbox phy joint effort between Microsoft and Broadcom, and is based on multi-switch support in sonic-sairedis. **- How I did it** Overall feature was implemented across several projects. The collective pull requests (some in late stages of review at this point): https://github.com/Azure/sonic-utilities/pull/931 - CLI (merged) https://github.com/Azure/sonic-swss-common/pull/347 - Minor changes (merged) https://github.com/Azure/sonic-swss/pull/1321 - gearsyncd, config parsers, changes to orchargent to create gearbox phy on supported systems https://github.com/Azure/sonic-sairedis/pull/624 - physyncd, virtual BCM81724 gearbox phy added to vslib **- How to verify it** In a vslib build: root@sonic:/home/admin# show gearbox interfaces status PHY Id Interface MAC Lanes MAC Lane Speed PHY Lanes PHY Lane Speed Line Lanes Line Lane Speed Oper Admin -------- ----------- --------------- ---------------- --------------- ---------------- ------------ ----------------- ------ ------- 1 Ethernet48 121,122,123,124 25G 200,201,202,203 25G 204,205 50G down down 1 Ethernet49 125,126,127,128 25G 206,207,208,209 25G 210,211 50G down down 1 Ethernet50 69,70,71,72 25G 212,213,214,215 25G 216 100G down down In addition, docker ps | grep phy should show a physyncd docker running. Signed-off-by: syd.logan@broadcom.com
2020-09-25 10:32:44 -05:00
[program:gearsyncd]
command=/usr/bin/gearsyncd -p /usr/share/sonic/hwsku/gearbox_config.json
priority=3
autostart=false
autorestart=false
startsecs=0
startretries=0
stdout_logfile=syslog
stderr_logfile=syslog
dependent_startup=true
dependent_startup_wait_for=rsyslogd:running
[docker-orchagent]: start portsyncd before orchagent (#4845) 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>
2020-06-25 00:48:37 -05:00
[program:portsyncd]
command=/usr/bin/portsyncd
[Dockers]: Manage all Docker containers with Supervisord (#573) - Consolidate config.sh and start.sh scripts into one script (start.sh) - Solve issue #435 - All dockers now run supervisord as their ENTRYPOINT - All stdout/stderr output from processes managed by supervisord is now sent to syslog instead of their own files - Supervisord log messages are now also sent to syslog - Removed unused smartmontools package from docker-platform-monitor
2017-05-08 17:43:31 -05:00
priority=3
autostart=false
[dockers]: Disable autorestart on all supervisor processes inside containers (#580)
2017-05-09 19:37:08 -05:00
autorestart=false
[Dockers]: Manage all Docker containers with Supervisord (#573) - Consolidate config.sh and start.sh scripts into one script (start.sh) - Solve issue #435 - All dockers now run supervisord as their ENTRYPOINT - All stdout/stderr output from processes managed by supervisord is now sent to syslog instead of their own files - Supervisord log messages are now also sent to syslog - Removed unused smartmontools package from docker-platform-monitor
2017-05-08 17:43:31 -05:00
stdout_logfile=syslog
stderr_logfile=syslog
[docker-orchagent]: use service dependency in supervisord to start services
2020-05-15 19:09:16 -05:00
dependent_startup=true
dependent_startup_wait_for=rsyslogd:running
[Dockers]: Manage all Docker containers with Supervisord (#573) - Consolidate config.sh and start.sh scripts into one script (start.sh) - Solve issue #435 - All dockers now run supervisord as their ENTRYPOINT - All stdout/stderr output from processes managed by supervisord is now sent to syslog instead of their own files - Supervisord log messages are now also sent to syslog - Removed unused smartmontools package from docker-platform-monitor
2017-05-08 17:43:31 -05:00
[docker-orchagent]: start portsyncd before orchagent (#4845) 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>
2020-06-25 00:48:37 -05:00
[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
[swss] Start Restore Neighbor After SWSS Config (#5451) SWSS config script restore ARP/FDB/Routes. Restore neighbor script uses config DB ARP information to restore ARP entries and so needs to be started after swssconfig exits. signed-off-by: Tamer Ahmed <tamer.ahmed@microsoft.com>
2020-09-24 16:57:42 -05:00
[program:swssconfig]
command=/usr/bin/swssconfig.sh
[docker-orchagent]: start portsyncd before orchagent (#4845) 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>
2020-06-25 00:48:37 -05:00
priority=5
[docker-orchagent]: Properly manage with supervisord (#589)
2017-05-11 13:18:10 -05:00
autostart=false
[swss] Start Restore Neighbor After SWSS Config (#5451) SWSS config script restore ARP/FDB/Routes. Restore neighbor script uses config DB ARP information to restore ARP entries and so needs to be started after swssconfig exits. signed-off-by: Tamer Ahmed <tamer.ahmed@microsoft.com>
2020-09-24 16:57:42 -05:00
autorestart=unexpected
[docker-orchagent]: use service dependency in supervisord to start services
2020-05-15 19:09:16 -05:00
startretries=0
[swss] Start Restore Neighbor After SWSS Config (#5451) SWSS config script restore ARP/FDB/Routes. Restore neighbor script uses config DB ARP information to restore ARP entries and so needs to be started after swssconfig exits. signed-off-by: Tamer Ahmed <tamer.ahmed@microsoft.com>
2020-09-24 16:57:42 -05:00
startsecs=0
[docker-orchagent]: Properly manage with supervisord (#589)
2017-05-11 13:18:10 -05:00
stdout_logfile=syslog
stderr_logfile=syslog
[docker-orchagent]: use service dependency in supervisord to start services
2020-05-15 19:09:16 -05:00
dependent_startup=true
dependent_startup_wait_for=orchagent:running
[docker-orchagent]: Properly manage with supervisord (#589)
2017-05-11 13:18:10 -05:00
[swss] Start Restore Neighbor After SWSS Config (#5451) SWSS config script restore ARP/FDB/Routes. Restore neighbor script uses config DB ARP information to restore ARP entries and so needs to be started after swssconfig exits. signed-off-by: Tamer Ahmed <tamer.ahmed@microsoft.com>
2020-09-24 16:57:42 -05:00
[program:restore_neighbors]
command=/usr/bin/restore_neighbors.py
[swss][supervisord.conf] Remove intfsyncd
2019-01-13 08:04:39 -06:00
priority=6
[docker-orchagent]: Properly manage with supervisord (#589)
2017-05-11 13:18:10 -05:00
autostart=false
[swss] Start Restore Neighbor After SWSS Config (#5451) SWSS config script restore ARP/FDB/Routes. Restore neighbor script uses config DB ARP information to restore ARP entries and so needs to be started after swssconfig exits. signed-off-by: Tamer Ahmed <tamer.ahmed@microsoft.com>
2020-09-24 16:57:42 -05:00
autorestart=false
Set swssconfig.sh startsecs=0 for quick exit (#2181) The default startsecs is 1 second. However, swssconfig.sh will quickly exit with expected exit code 0 during warm starting. This case should not be treated as a failure
2018-10-23 01:40:24 -05:00
startsecs=0
[swss] Start Restore Neighbor After SWSS Config (#5451) SWSS config script restore ARP/FDB/Routes. Restore neighbor script uses config DB ARP information to restore ARP entries and so needs to be started after swssconfig exits. signed-off-by: Tamer Ahmed <tamer.ahmed@microsoft.com>
2020-09-24 16:57:42 -05:00
startretries=0
[docker-orchagent]: Properly manage with supervisord (#589)
2017-05-11 13:18:10 -05:00
stdout_logfile=syslog
stderr_logfile=syslog
[docker-orchagent]: use service dependency in supervisord to start services
2020-05-15 19:09:16 -05:00
dependent_startup=true
[swss] Start Restore Neighbor After SWSS Config (#5451) SWSS config script restore ARP/FDB/Routes. Restore neighbor script uses config DB ARP information to restore ARP entries and so needs to be started after swssconfig exits. signed-off-by: Tamer Ahmed <tamer.ahmed@microsoft.com>
2020-09-24 16:57:42 -05:00
dependent_startup_wait_for=swssconfig:exited
[docker-orchagent]: Properly manage with supervisord (#589)
2017-05-11 13:18:10 -05:00
Copp Manager Changes (#4861) *Introduce CoPP Manager infrastructure Copp service to generate initial copp config template file Co-authored-by: dgsudharsan <sudharsan_gopalarat@dell.com>
2020-11-23 11:31:42 -06:00
[program:coppmgrd]
command=/usr/bin/coppmgrd
priority=6
autostart=false
autorestart=unexpected
startretries=0
startsecs=0
stdout_logfile=syslog
stderr_logfile=syslog
dependent_startup=true
dependent_startup_wait_for=orchagent:running
[docker-orchagent]: use service dependency in supervisord to start services
2020-05-15 19:09:16 -05:00
[program:neighsyncd]
command=/usr/bin/neighsyncd
[docker-orchagent]: start portsyncd before orchagent (#4845) 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>
2020-06-25 00:48:37 -05:00
priority=7
[docker-orchagent]: use service dependency in supervisord to start services
2020-05-15 19:09:16 -05:00
autostart=false
autorestart=false
stdout_logfile=syslog
stderr_logfile=syslog
dependent_startup=true
dependent_startup_wait_for=swssconfig:exited
[configdb]: Add support for vlanconfd and intfconfd (#1063) * Add support for vlanconfd and intfconfd Signed-off-by: Jipan Yang <jipan.yang@alibaba-inc.com> * Change name to vlanmgrd and intfmgrd Signed-off-by: Jipan Yang <jipan.yang@alibaba-inc.com> * Add missing vlan_members for parse_dpg result Signed-off-by: Jipan Yang <jipan.yang@alibaba-inc.com> * Remove cfgmgr debug CLI from image Signed-off-by: Jipan Yang <jipan.yang@alibaba-inc.com> * Update swss and swss-common submodules for VLAN trunk support Signed-off-by: Jipan Yang <jipan.yang@alibaba-inc.com>
2017-11-06 00:37:16 -06:00
[program:vlanmgrd]
command=/usr/bin/vlanmgrd
[swss][supervisord.conf] Remove intfsyncd
2019-01-13 08:04:39 -06:00
priority=8
[configdb]: Add support for vlanconfd and intfconfd (#1063) * Add support for vlanconfd and intfconfd Signed-off-by: Jipan Yang <jipan.yang@alibaba-inc.com> * Change name to vlanmgrd and intfmgrd Signed-off-by: Jipan Yang <jipan.yang@alibaba-inc.com> * Add missing vlan_members for parse_dpg result Signed-off-by: Jipan Yang <jipan.yang@alibaba-inc.com> * Remove cfgmgr debug CLI from image Signed-off-by: Jipan Yang <jipan.yang@alibaba-inc.com> * Update swss and swss-common submodules for VLAN trunk support Signed-off-by: Jipan Yang <jipan.yang@alibaba-inc.com>
2017-11-06 00:37:16 -06:00
autostart=false
autorestart=false
stdout_logfile=syslog
stderr_logfile=syslog
[docker-orchagent]: use service dependency in supervisord to start services
2020-05-15 19:09:16 -05:00
dependent_startup=true
dependent_startup_wait_for=swssconfig:exited
[configdb]: Add support for vlanconfd and intfconfd (#1063) * Add support for vlanconfd and intfconfd Signed-off-by: Jipan Yang <jipan.yang@alibaba-inc.com> * Change name to vlanmgrd and intfmgrd Signed-off-by: Jipan Yang <jipan.yang@alibaba-inc.com> * Add missing vlan_members for parse_dpg result Signed-off-by: Jipan Yang <jipan.yang@alibaba-inc.com> * Remove cfgmgr debug CLI from image Signed-off-by: Jipan Yang <jipan.yang@alibaba-inc.com> * Update swss and swss-common submodules for VLAN trunk support Signed-off-by: Jipan Yang <jipan.yang@alibaba-inc.com>
2017-11-06 00:37:16 -06:00
[program:intfmgrd]
command=/usr/bin/intfmgrd
[swss][supervisord.conf] Remove intfsyncd
2019-01-13 08:04:39 -06:00
priority=9
[configdb]: Add support for vlanconfd and intfconfd (#1063) * Add support for vlanconfd and intfconfd Signed-off-by: Jipan Yang <jipan.yang@alibaba-inc.com> * Change name to vlanmgrd and intfmgrd Signed-off-by: Jipan Yang <jipan.yang@alibaba-inc.com> * Add missing vlan_members for parse_dpg result Signed-off-by: Jipan Yang <jipan.yang@alibaba-inc.com> * Remove cfgmgr debug CLI from image Signed-off-by: Jipan Yang <jipan.yang@alibaba-inc.com> * Update swss and swss-common submodules for VLAN trunk support Signed-off-by: Jipan Yang <jipan.yang@alibaba-inc.com>
2017-11-06 00:37:16 -06:00
autostart=false
autorestart=false
stdout_logfile=syslog
stderr_logfile=syslog
[docker-orchagent]: use service dependency in supervisord to start services
2020-05-15 19:09:16 -05:00
dependent_startup=true
dependent_startup_wait_for=swssconfig:exited
Buffers configuration update on port speed change (#1345) * Move buffer configuration to ConfigDB Signed-off-by: Andriy Moroz <c_andriym@mellanox.com> * Converted Dell and Arista configs Signed-off-by: Andriy Moroz <c_andriym@mellanox.com> * Add buffer configs for ACS-MSN2740 Signed-off-by: Andriy Moroz <c_andriym@mellanox.com> * Updated buffers template Signed-off-by: Andriy Moroz <c_andriym@mellanox.com> * Fixed j2 unit test Signed-off-by: Andriy Moroz <c_andriym@mellanox.com> * Update buffers config for Force10-S6100 Signed-off-by: Andriy Moroz <c_andriym@mellanox.com> * Update VS docker to support speed and buffers test Signed-off-by: Andriy Moroz <c_andriym@mellanox.com> * Update buffers config generation - fixed support of sonic-to-sonic install Signed-off-by: Andriy Moroz <c_andriym@mellanox.com> * Update submodules pointers for buffers config Signed-off-by: Andriy Moroz <c_andriym@mellanox.com>
2018-01-29 10:11:05 -06:00
[interfaces]: Move IP/MTU information from interfaces file into database (#1908) - Move front panel ports and port channels MTU and IP configurations out of the current /etc/network/interfaces file and store them in the configuration database. - The default MTU value for both front panel ports and the port channels is 9100. They are set via the minigraph or 9100 by default. - Introduce portmgrd which will pick up the MTU configurations from the configuration database. - The updated intfmgrd will pick up IP address changes from the configuration database. - Update sonic-swss submodule Signed-off-by: Shu0T1an ChenG <shuche@microsoft.com>
2018-08-20 13:19:16 -05:00
[program:portmgrd]
command=/usr/bin/portmgrd
[swss][supervisord.conf] Remove intfsyncd
2019-01-13 08:04:39 -06:00
priority=10
[interfaces]: Move IP/MTU information from interfaces file into database (#1908) - Move front panel ports and port channels MTU and IP configurations out of the current /etc/network/interfaces file and store them in the configuration database. - The default MTU value for both front panel ports and the port channels is 9100. They are set via the minigraph or 9100 by default. - Introduce portmgrd which will pick up the MTU configurations from the configuration database. - The updated intfmgrd will pick up IP address changes from the configuration database. - Update sonic-swss submodule Signed-off-by: Shu0T1an ChenG <shuche@microsoft.com>
2018-08-20 13:19:16 -05:00
autostart=false
autorestart=false
stdout_logfile=syslog
stderr_logfile=syslog
[docker-orchagent]: use service dependency in supervisord to start services
2020-05-15 19:09:16 -05:00
dependent_startup=true
dependent_startup_wait_for=swssconfig:exited
[interfaces]: Move IP/MTU information from interfaces file into database (#1908) - Move front panel ports and port channels MTU and IP configurations out of the current /etc/network/interfaces file and store them in the configuration database. - The default MTU value for both front panel ports and the port channels is 9100. They are set via the minigraph or 9100 by default. - Introduce portmgrd which will pick up the MTU configurations from the configuration database. - The updated intfmgrd will pick up IP address changes from the configuration database. - Update sonic-swss submodule Signed-off-by: Shu0T1an ChenG <shuche@microsoft.com>
2018-08-20 13:19:16 -05:00
Buffers configuration update on port speed change (#1345) * Move buffer configuration to ConfigDB Signed-off-by: Andriy Moroz <c_andriym@mellanox.com> * Converted Dell and Arista configs Signed-off-by: Andriy Moroz <c_andriym@mellanox.com> * Add buffer configs for ACS-MSN2740 Signed-off-by: Andriy Moroz <c_andriym@mellanox.com> * Updated buffers template Signed-off-by: Andriy Moroz <c_andriym@mellanox.com> * Fixed j2 unit test Signed-off-by: Andriy Moroz <c_andriym@mellanox.com> * Update buffers config for Force10-S6100 Signed-off-by: Andriy Moroz <c_andriym@mellanox.com> * Update VS docker to support speed and buffers test Signed-off-by: Andriy Moroz <c_andriym@mellanox.com> * Update buffers config generation - fixed support of sonic-to-sonic install Signed-off-by: Andriy Moroz <c_andriym@mellanox.com> * Update submodules pointers for buffers config Signed-off-by: Andriy Moroz <c_andriym@mellanox.com>
2018-01-29 10:11:05 -06:00
[program:buffermgrd]
[Dynamic buffer calc] Support dynamic buffer calculation (#6194) **- Why I did it** To support dynamic buffer calculation. This PR also depends on the following PRs for sub modules - [sonic-swss: [buffermgr/bufferorch] Support dynamic buffer calculation #1338](https://github.com/Azure/sonic-swss/pull/1338) - [sonic-swss-common: Dynamic buffer calculation #361](https://github.com/Azure/sonic-swss-common/pull/361) - [sonic-utilities: Support dynamic buffer calculation #973](https://github.com/Azure/sonic-utilities/pull/973) **- How I did it** 1. Introduce field `buffer_model` in `DEVICE_METADATA|localhost` to represent which buffer model is running in the system currently: - `dynamic` for the dynamic buffer calculation model - `traditional` for the traditional model in which the `pg_profile_lookup.ini` is used 2. Add the tables required for the feature: - ASIC_TABLE in platform/\<vendor\>/asic_table.j2 - PERIPHERAL_TABLE in platform/\<vendor\>/peripheral_table.j2 - PORT_PERIPHERAL_TABLE on a per-platform basis in device/\<vendor\>/\<platform\>/port_peripheral_config.j2 for each platform with gearbox installed. - DEFAULT_LOSSLESS_BUFFER_PARAMETER and LOSSLESS_TRAFFIC_PATTERN in files/build_templates/buffers_config.j2 - Add lossless PGs (3-4) for each port in files/build_templates/buffers_config.j2 3. Copy the newly introduced j2 files into the image and rendering them when the system starts 4. Update the CLI options for buffermgrd so that it can start with dynamic mode 5. Fetches the ASIC vendor name in orchagent: - fetch the vendor name when creates the docker and pass it as a docker environment variable - `buffermgrd` can use this passed-in variable 6. Clear buffer related tables from STATE_DB when swss docker starts 7. Update the src/sonic-config-engine/tests/sample_output/buffers-dell6100.json according to the buffer_config.j2 8. Remove buffer pool sizes for ingress pools and egress_lossy_pool Update the buffer settings for dynamic buffer calculation
2020-12-13 13:35:39 -06:00
command=/usr/bin/buffermgrd.sh
[swss][supervisord.conf] Remove intfsyncd
2019-01-13 08:04:39 -06:00
priority=11
Buffers configuration update on port speed change (#1345) * Move buffer configuration to ConfigDB Signed-off-by: Andriy Moroz <c_andriym@mellanox.com> * Converted Dell and Arista configs Signed-off-by: Andriy Moroz <c_andriym@mellanox.com> * Add buffer configs for ACS-MSN2740 Signed-off-by: Andriy Moroz <c_andriym@mellanox.com> * Updated buffers template Signed-off-by: Andriy Moroz <c_andriym@mellanox.com> * Fixed j2 unit test Signed-off-by: Andriy Moroz <c_andriym@mellanox.com> * Update buffers config for Force10-S6100 Signed-off-by: Andriy Moroz <c_andriym@mellanox.com> * Update VS docker to support speed and buffers test Signed-off-by: Andriy Moroz <c_andriym@mellanox.com> * Update buffers config generation - fixed support of sonic-to-sonic install Signed-off-by: Andriy Moroz <c_andriym@mellanox.com> * Update submodules pointers for buffers config Signed-off-by: Andriy Moroz <c_andriym@mellanox.com>
2018-01-29 10:11:05 -06:00
autostart=false
autorestart=false
stdout_logfile=syslog
stderr_logfile=syslog
[docker-orchagent]: use service dependency in supervisord to start services
2020-05-15 19:09:16 -05:00
dependent_startup=true
dependent_startup_wait_for=swssconfig:exited
[docker-orchagent]: Add vrfmgrd to supervisorctl (#2055) * [docker-orchagent]: Add vrfmgrd to supervisorctl Signed-off-by: Marian Pritsak <marianp@mellanox.com> * [sonic-vs]: Add vrfmgrd to supervisorctl Signed-off-by: Marian Pritsak <marianp@mellanox.com>
2018-09-20 00:18:39 -05:00
[program:vrfmgrd]
command=/usr/bin/vrfmgrd
[swss][supervisord.conf] Remove intfsyncd
2019-01-13 08:04:39 -06:00
priority=13
[docker-orchagent]: Add vrfmgrd to supervisorctl (#2055) * [docker-orchagent]: Add vrfmgrd to supervisorctl Signed-off-by: Marian Pritsak <marianp@mellanox.com> * [sonic-vs]: Add vrfmgrd to supervisorctl Signed-off-by: Marian Pritsak <marianp@mellanox.com>
2018-09-20 00:18:39 -05:00
autostart=false
autorestart=false
stdout_logfile=syslog
stderr_logfile=syslog
[docker-orchagent]: use service dependency in supervisord to start services
2020-05-15 19:09:16 -05:00
dependent_startup=true
dependent_startup_wait_for=swssconfig:exited
Restore neighbor table to kernel during system warm-reboot (#2213) * Restore neighbor table to kernel during system warm-reboot Added a service: "restore_neighbors" to restore neighbor table into kernel during system warm reboot. The service is started by supervisord in swss docker when the docker is started. In case system warm reboot is enabled, it will try to restore the neighbor table from appDB into kernel through netlink API calls and update the neighbor table by sending arp/ns requests to all neighbor entries, then it sets the stateDB flag for neighsyncd to continue the reconciliation process. -- Added tcpdump python-scapy debian package into orchagent and vs dockers. -- Added python module: pyroute2 netifaces into orchagent and vc dockers. -- Workarounded tcpdump issue in the vs docker Signed-off-by: Zhenggen Xu <zxu@linkedin.com> * Move the restore_neighbors.py to sonic-swss submodule Made changes to makefiles accordingly Make dockerfile.j2 changes and supervisord config changes Add python monotonic lib for time access Signed-off-by: Zhenggen Xu <zxu@linkedin.com> * Added PYTHON_SWSSCOMMON as swss runtime dependency Signed-off-by: Zhenggen Xu <zxu@linkedin.com>
2018-11-09 19:06:09 -06:00
Add nbrmgr to supervisor control (#2265) * Add nbrmgr to supervisord conf * Corrected priority values [Fix typo] * Submodule update for Neighbor manager daemon Submodule update sonic-swss-common: edbfeec - Remove default docker name value of swss. (#250) 9728462 - Corrected configDB name for neigh table (#251) 6decc65 - Add NEIGH_TABLE to configDB for neighbor configuration (#249) 9918ae6 - Add ProducerStateTable temp view implementation and UT (#247) 41408f2 - Update README on dependencies d9c0ba4 -Update README on the section 'Build with Google Test' bb7fa5b - [ut]: explicit convert is to bool type (#248) 661b82c - Add gtest instruction in README Submodule update sonic-swss 705b092 - Support ConfigDB neighbor configuration, introduce nbrmgr daemon (#693) 8522390 - Add vxlan switch attributes to switch orch (#712) b123fa0 - [schema] update WARM_RESTART_TABLE:process_name schema document (#707) 2d7ab0c - Revert "Align default MTU value as SAI default (#705)" (#710) 836a58c - Align default MTU value as SAI default (#705) bffa01f - VNET/VXLAN changes (#643) b750a4b - [watermarkorch] add watermarkorch, extend queue and pg counters with wat\u2026 (#629)
2018-11-28 23:58:59 -06:00
[program:nbrmgrd]
command=/usr/bin/nbrmgrd
[swss][supervisord.conf] Remove intfsyncd
2019-01-13 08:04:39 -06:00
priority=15
Add nbrmgr to supervisor control (#2265) * Add nbrmgr to supervisord conf * Corrected priority values [Fix typo] * Submodule update for Neighbor manager daemon Submodule update sonic-swss-common: edbfeec - Remove default docker name value of swss. (#250) 9728462 - Corrected configDB name for neigh table (#251) 6decc65 - Add NEIGH_TABLE to configDB for neighbor configuration (#249) 9918ae6 - Add ProducerStateTable temp view implementation and UT (#247) 41408f2 - Update README on dependencies d9c0ba4 -Update README on the section 'Build with Google Test' bb7fa5b - [ut]: explicit convert is to bool type (#248) 661b82c - Add gtest instruction in README Submodule update sonic-swss 705b092 - Support ConfigDB neighbor configuration, introduce nbrmgr daemon (#693) 8522390 - Add vxlan switch attributes to switch orch (#712) b123fa0 - [schema] update WARM_RESTART_TABLE:process_name schema document (#707) 2d7ab0c - Revert "Align default MTU value as SAI default (#705)" (#710) 836a58c - Align default MTU value as SAI default (#705) bffa01f - VNET/VXLAN changes (#643) b750a4b - [watermarkorch] add watermarkorch, extend queue and pg counters with wat\u2026 (#629)
2018-11-28 23:58:59 -06:00
autostart=false
autorestart=false
stdout_logfile=syslog
stderr_logfile=syslog
[docker-orchagent]: use service dependency in supervisord to start services
2020-05-15 19:09:16 -05:00
dependent_startup=true
dependent_startup_wait_for=swssconfig:exited
Add nbrmgr to supervisor control (#2265) * Add nbrmgr to supervisord conf * Corrected priority values [Fix typo] * Submodule update for Neighbor manager daemon Submodule update sonic-swss-common: edbfeec - Remove default docker name value of swss. (#250) 9728462 - Corrected configDB name for neigh table (#251) 6decc65 - Add NEIGH_TABLE to configDB for neighbor configuration (#249) 9918ae6 - Add ProducerStateTable temp view implementation and UT (#247) 41408f2 - Update README on dependencies d9c0ba4 -Update README on the section 'Build with Google Test' bb7fa5b - [ut]: explicit convert is to bool type (#248) 661b82c - Add gtest instruction in README Submodule update sonic-swss 705b092 - Support ConfigDB neighbor configuration, introduce nbrmgr daemon (#693) 8522390 - Add vxlan switch attributes to switch orch (#712) b123fa0 - [schema] update WARM_RESTART_TABLE:process_name schema document (#707) 2d7ab0c - Revert "Align default MTU value as SAI default (#705)" (#710) 836a58c - Align default MTU value as SAI default (#705) bffa01f - VNET/VXLAN changes (#643) b750a4b - [watermarkorch] add watermarkorch, extend queue and pg counters with wat\u2026 (#629)
2018-11-28 23:58:59 -06:00
[vxlanmgrd]: Add vxlanmgrd start command (#2705) * Add bridge-utils to orchagent image - Add vxlanmgrd to supervisorctl in docker -orchagent Signed-off-by: Ze Gan zegan@microsoft.com * Update submodule pointer for swss to include Vxlanmgrd changes
2019-04-23 22:38:08 -05:00
[program:vxlanmgrd]
command=/usr/bin/vxlanmgrd
priority=16
autostart=false
autorestart=false
stdout_logfile=syslog
stderr_logfile=syslog
[docker-orchagent]: use service dependency in supervisord to start services
2020-05-15 19:09:16 -05:00
dependent_startup=true
dependent_startup_wait_for=swssconfig:exited
[submodule]: swss Tunnel Manager changes (#5843) Introduce tunnel manager daemon. Start the process as part of swss container Submodule update for swss: 9ed3026 - 2020-12-24 : [NAT] ACL Rule with DO_NOT_NAT action is getting failed. (#1502) [Akhilesh Samineni] c39a4b1 - 2020-12-23 : Mux/IPTunnel orchagent changes (#1497) [Prince Sunny] bc8df0e - 2020-12-23 : Add support for headroom pool watermark (#1567) [Neetha John]
2020-12-26 13:17:18 -06:00
[program:tunnelmgrd]
command=/usr/bin/tunnelmgrd
priority=17
autostart=false
autorestart=false
stdout_logfile=syslog
stderr_logfile=syslog
dependent_startup=true
dependent_startup_wait_for=swssconfig:exited
[docker-orchagent]: use service dependency in supervisord to start services
2020-05-15 19:09:16 -05:00
[program:enable_counters]
command=/usr/bin/enable_counters.py
priority=12
autostart=false
autorestart=false
stdout_logfile=syslog
stderr_logfile=syslog
dependent_startup=true
dependent_startup_wait_for=swssconfig:exited
Add support to start fdbsyncd when orchagent docker starts (#5979) Add support to start fdbsyncd when swss docker starts. New demon is added to sync MAC from Kernel to DB and vise versa.
2020-12-24 20:36:01 -06:00
[program:fdbsyncd]
command=/usr/bin/fdbsyncd
priority=17
autostart=false
autorestart=false
stdout_logfile=syslog
stderr_logfile=syslog
dependent_startup=true
dependent_startup_wait_for=swssconfig:exited
Reference in New Issue Copy Permalink