Skip to content

Commit 8fd50e8

Browse files
authored
[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]
1 parent a79fcb4 commit 8fd50e8

File tree

6 files changed

+26
-1
lines changed

6 files changed

+26
-1
lines changed

dockers/docker-orchagent/base_image_files/monit_swss

+5
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
## nbrmgrd
1414
## vxlanmgrd
1515
## coppmgrd
16+
## tunnelmgrd
17+
1618
##############################################################################
1719
check program swss|orchagent with path "/usr/bin/process_checker swss /usr/bin/orchagent -d /var/log/swss"
1820
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
4951

5052
check program swss|coppmgrd with path "/usr/bin/process_checker swss /usr/bin/coppmgrd"
5153
if status != 0 for 5 times within 5 cycles then alert repeat every 1 cycles
54+
55+
check program swss|tunnelmgrd with path "/usr/bin/process_checker swss /usr/bin/tunnelmgrd"
56+
if status != 0 for 5 times within 5 cycles then alert repeat every 1 cycles

dockers/docker-orchagent/critical_processes

+1
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,4 @@ program:vrfmgrd
1010
program:nbrmgrd
1111
program:vxlanmgrd
1212
program:coppmgrd
13+
program:tunnelmgrd

dockers/docker-orchagent/supervisord.conf

+10
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,16 @@ stderr_logfile=syslog
175175
dependent_startup=true
176176
dependent_startup_wait_for=swssconfig:exited
177177

178+
[program:tunnelmgrd]
179+
command=/usr/bin/tunnelmgrd
180+
priority=17
181+
autostart=false
182+
autorestart=false
183+
stdout_logfile=syslog
184+
stderr_logfile=syslog
185+
dependent_startup=true
186+
dependent_startup_wait_for=swssconfig:exited
187+
178188
[program:enable_counters]
179189
command=/usr/bin/enable_counters.py
180190
priority=12

platform/vs/docker-sonic-vs/start.sh

+2
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,8 @@ supervisorctl start natmgrd
135135

136136
supervisorctl start natsyncd
137137

138+
supervisorctl start tunnelmgrd
139+
138140
# Start arp_update when VLAN exists
139141
VLAN=`sonic-cfggen -d -v 'VLAN.keys() | join(" ") if VLAN'`
140142
if [ "$VLAN" != "" ]; then

platform/vs/docker-sonic-vs/supervisord.conf

+7
Original file line numberDiff line numberDiff line change
@@ -229,3 +229,10 @@ autorestart=false
229229
stdout_logfile=syslog
230230
stderr_logfile=syslog
231231

232+
[program:tunnelmgrd]
233+
command=/usr/bin/tunnelmgrd
234+
priority=26
235+
autostart=false
236+
autorestart=false
237+
stdout_logfile=syslog
238+
stderr_logfile=syslog

src/sonic-swss

0 commit comments

Comments
 (0)