matthew/sonic-buildimage
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
9b70262dc7
sonic-buildimage/dockers/docker-orchagent/docker-init.sh

41 lines
1.4 KiB
Bash
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
#!/usr/bin/env bash
Squash merge latest code to github branch
2016-07-26 14:01:58 -05:00
[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
mkdir -p /etc/swss/config.d/
[swss]: Generate config files for Everflow and IPinIP from minigraph (#507) [swss]: Generate config files for Everflow and IPinIP from minigraph - Add Everflow DST IP to minigraph file - Extend minigraph.py to support Everflow - Add templates file for Everflow and IPinIP configuration - Add config.sh for swss docker to generate config files
2017-04-21 16:28:30 -05:00
[swss] Reduce Calls to SONiC Cfggen (#5177) Calls to sonic-cfggen is CPU expensive. This PR reduces calls to sonic-cfggen to one call during startup when starting swss service. singed-off-by: Tamer Ahmed <tamer.ahmed@microsoft.com>
2020-08-17 17:47:52 -05:00
CFGGEN_PARAMS=" \
-d \
-y /etc/sonic/constants.yml \
-t /usr/share/sonic/templates/switch.json.j2,/etc/swss/config.d/switch.json \
-t /usr/share/sonic/templates/ipinip.json.j2,/etc/swss/config.d/ipinip.json \
-t /usr/share/sonic/templates/ports.json.j2,/etc/swss/config.d/ports.json \
-t /usr/share/sonic/templates/vlan_vars.j2 \
[docker-orchagent]: Add NDP Proxy Daemon (#5517) * Install ndppd during image build, and copy config files to image * Configure proxy settings based on config DB at container start * Pipe ndppd output to logger inside container to log output in syslog
2020-10-05 10:48:13 -05:00
-t /usr/share/sonic/templates/ndppd.conf.j2,/etc/ndppd.conf \
[swss]: Wait for vlan intf to start ndppd (#10119) (#10153) 202012 version of #10119 Why I did it If the VLAN interface is not up when ndppd starts, it will fail to enable allmulti mode on the interface and be unable to process received NDP packets The following logs are seen: /var/log/syslog.33.gz:Feb 18 10:33:12.825406 sonic INFO swss#/supervisord: ndppd (error) Failed to set allmulti: No such device How I did it Use the wait_for_link script currently used by radv to delay ndppd startup until the vlan interface is ready How to verify it Apply the changes to a device. config reload the device and confirm that the above error logs are not observed when ndppd starts. Run the arp/test_arp_dualtor.py::test_proxy_arp test case and verify it passes.
2022-03-04 22:40:29 -06:00
-t /usr/share/sonic/templates/wait_for_link.sh.j2,/usr/bin/wait_for_link.sh \
[swss] Reduce Calls to SONiC Cfggen (#5177) Calls to sonic-cfggen is CPU expensive. This PR reduces calls to sonic-cfggen to one call during startup when starting swss service. singed-off-by: Tamer Ahmed <tamer.ahmed@microsoft.com>
2020-08-17 17:47:52 -05:00
"
VLAN=$(sonic-cfggen $CFGGEN_PARAMS)
[swss]: Run tunnel_pkt_handler on dualtor only (#11626) At SWSS docker init time, check the device subtype and enable tunnel packet handler only if it is dualtor Signed-off-by: Lawrence Lee <lawlee@microsoft.com>
2022-08-05 13:33:37 -05:00
SUBTYPE=$(sonic-cfggen -d -v "DEVICE_METADATA['localhost']['subtype']")
ONEImage - Read all platform dependent information from sonic-config-engine (#238) Read all platform dependent information from sonic-config-engine
2017-02-02 22:34:34 -06:00
[swss]: Wait for vlan intf to start ndppd (#10119) (#10153) 202012 version of #10119 Why I did it If the VLAN interface is not up when ndppd starts, it will fail to enable allmulti mode on the interface and be unable to process received NDP packets The following logs are seen: /var/log/syslog.33.gz:Feb 18 10:33:12.825406 sonic INFO swss#/supervisord: ndppd (error) Failed to set allmulti: No such device How I did it Use the wait_for_link script currently used by radv to delay ndppd startup until the vlan interface is ready How to verify it Apply the changes to a device. config reload the device and confirm that the above error logs are not observed when ndppd starts. Run the arp/test_arp_dualtor.py::test_proxy_arp test case and verify it passes.
2022-03-04 22:40:29 -06:00
chmod +x /usr/bin/wait_for_link.sh
[Arista] Increase switch PCIe timeout for 7060-cx32s (#9248) Co-authored-by: Zhi Yuan (Carl) Zhao <zyzhao@arista.com> Why I did it Arista 7060 platform has a rare and unreproduceable PCIe timeout that could possibly be solved with increasing the switch PCIe timeout value. To do this we'll call a script for this platform to increase the PCIe timeout on boot-up. No issues would be expected from the setpci command. From the PCIe spec: "Software is permitted to change the value in this field at any time. For Requests already pending when the Completion Timeout Value is changed, hardware is permitted to use either the new or the old value for the outstanding Requests, and is permitted to base the start time for each Request either on when this value was changed or on when each request was issued. " How I did it Add "platform-init" support in swss docker similar to how "hwsku-init" is called, only this would be for any device belonging to a platform. Then the script would reside in device data folder. Additionally, add pciutils dependency to docker-orchagent so it can run the setpci commands. How to verify it On bootup of an Arista 7060, can execute: lspci -vv -s 01:00.0 | grep -i "devctl2" In order to check that the timeout has changed.
2021-12-17 10:43:25 -06:00
# Executed platform specific initialization tasks.
if [ -x /usr/share/sonic/platform/platform-init ]; then
/usr/share/sonic/platform/platform-init
fi
[hwsku-init] Introduce mechanism to run HWSKU specific initialization code (#2072) When there is HWSKU specific initialization needs to be performed, please add hwsku-init script under device folder, it will be invoked by swss before any subsequent initializations. Signed-off-by: Ying Xie <ying.xie@microsoft.com>
2018-09-24 16:56:37 -05:00
# Executed HWSKU specific initialization tasks.
if [ -x /usr/share/sonic/hwsku/hwsku-init ]; then
/usr/share/sonic/hwsku/hwsku-init
fi
[docker-orchagent]: Add NDP Proxy Daemon (#5517) * Install ndppd during image build, and copy config files to image * Configure proxy settings based on config DB at container start * Pipe ndppd output to logger inside container to log output in syslog
2020-10-05 10:48:13 -05:00
# Start arp_update and NDP proxy daemon when VLAN exists
[orchagent]: Add ARP update script to maintain VLAN neighbors (#401) - Extend ARP reachable time to 30min - Add arping to docker-swss - Add arp_update script to routinely probe neighbors Signed-off-by: Shuotian Cheng <shuche@microsoft.com>
2017-05-15 19:06:19 -05:00
if [ "$VLAN" != "" ]; then
[swss] Start Arp Update Process (#5391) Arp update process was not being started due to an issue with the directory name having an extra 'd' in supervisor as in '/etc/supervisord/conf.d/arp_update.conf'. signed-off-by: Tamer Ahmed <tamer.ahmed@microsoft.com>
2020-09-17 20:33:10 -05:00
cp /usr/share/sonic/templates/arp_update.conf /etc/supervisor/conf.d/
[docker-orchagent]: Add NDP Proxy Daemon (#5517) * Install ndppd during image build, and copy config files to image * Configure proxy settings based on config DB at container start * Pipe ndppd output to logger inside container to log output in syslog
2020-10-05 10:48:13 -05:00
cp /usr/share/sonic/templates/ndppd.conf /etc/supervisor/conf.d/
[orchagent]: Add ARP update script to maintain VLAN neighbors (#401) - Extend ARP reachable time to 30min - Add arping to docker-swss - Add arp_update script to routinely probe neighbors Signed-off-by: Shuotian Cheng <shuche@microsoft.com>
2017-05-15 19:06:19 -05:00
fi
[docker-orchagent]: use service dependency in supervisord to start services
2020-05-15 19:09:16 -05:00
[swss]: Run tunnel_pkt_handler on dualtor only (#11626) At SWSS docker init time, check the device subtype and enable tunnel packet handler only if it is dualtor Signed-off-by: Lawrence Lee <lawlee@microsoft.com>
2022-08-05 13:33:37 -05:00
if [ "$SUBTYPE" == "DualToR" ]; then
cp /usr/share/sonic/templates/tunnel_packet_handler.conf /etc/supervisor/conf.d/
fi
[supervisord]: use abspath as supervisord entrypoint (#5995) use abspath makes the entrypoint not affected by PATH env. Signed-off-by: Guohan Lu <lguohan@gmail.com>
2020-11-22 23:18:44 -06:00
exec /usr/local/bin/supervisord
Reference in New Issue Copy Permalink