matthew/sonic-buildimage
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

[submodule]: swss Tunnel Manager changes (#5843)

Browse Source 
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]
This commit is contained in:
Prince Sunny 2020-12-26 11:17:18 -08:00 committed by GitHub
parent a79fcb49d4
commit 8fd50e895c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dockers/docker-orchagent/base_image_files/monit_swss
View File

@ -13,6 +13,8 @@
## nbrmgrd ## nbrmgrd
## vxlanmgrd ## vxlanmgrd
## coppmgrd ## coppmgrd
## tunnelmgrd
############################################################################## ##############################################################################
check program swss|orchagent with path "/usr/bin/process_checker swss /usr/bin/orchagent -d /var/log/swss" check program swss|orchagent with path "/usr/bin/process_checker swss /usr/bin/orchagent -d /var/log/swss"
if status != 0 for 5 times within 5 cycles then alert repeat every 1 cycles if status != 0 for 5 times within 5 cycles then alert repeat every 1 cycles
@ -49,3 +51,6 @@ check program swss|vxlanmgrd with path "/usr/bin/process_checker swss /usr/bin/v
check program swss|coppmgrd with path "/usr/bin/process_checker swss /usr/bin/coppmgrd" check program swss|coppmgrd with path "/usr/bin/process_checker swss /usr/bin/coppmgrd"
if status != 0 for 5 times within 5 cycles then alert repeat every 1 cycles if status != 0 for 5 times within 5 cycles then alert repeat every 1 cycles
check program swss|tunnelmgrd with path "/usr/bin/process_checker swss /usr/bin/tunnelmgrd"
if status != 0 for 5 times within 5 cycles then alert repeat every 1 cycles

1
dockers/docker-orchagent/critical_processes
View File

@ -10,3 +10,4 @@ program:vrfmgrd
program:nbrmgrd program:nbrmgrd
program:vxlanmgrd program:vxlanmgrd
program:coppmgrd program:coppmgrd
program:tunnelmgrd

10
dockers/docker-orchagent/supervisord.conf
View File

@ -175,6 +175,16 @@ stderr_logfile=syslog
dependent_startup=true dependent_startup=true
dependent_startup_wait_for=swssconfig:exited dependent_startup_wait_for=swssconfig:exited
[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
[program:enable_counters] [program:enable_counters]
command=/usr/bin/enable_counters.py command=/usr/bin/enable_counters.py
priority=12 priority=12

2
platform/vs/docker-sonic-vs/start.sh
View File

@ -135,6 +135,8 @@ supervisorctl start natmgrd
supervisorctl start natsyncd supervisorctl start natsyncd
supervisorctl start tunnelmgrd
# Start arp_update when VLAN exists # Start arp_update when VLAN exists
VLAN=`sonic-cfggen -d -v 'VLAN.keys() | join(" ") if VLAN'` VLAN=`sonic-cfggen -d -v 'VLAN.keys() | join(" ") if VLAN'`
if [ "$VLAN" != "" ]; then if [ "$VLAN" != "" ]; then

7
platform/vs/docker-sonic-vs/supervisord.conf
View File

@ -229,3 +229,10 @@ autorestart=false
stdout_logfile=syslog stdout_logfile=syslog
stderr_logfile=syslog stderr_logfile=syslog
[program:tunnelmgrd]
command=/usr/bin/tunnelmgrd
priority=26
autostart=false
autorestart=false
stdout_logfile=syslog
stderr_logfile=syslog

2
src/sonic-swss

@ -1 +1 @@
Subproject commit ef41c4e9df80e64cc2aced424913fc9cae73cbec Subproject commit 9ed3026e4ac4fd05b8321d45848be3a85d96923e