Skip to content

Tunnel Manager changes #5843

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lguohan merged 9 commits into from
Dec 26, 2020
Merged

Tunnel Manager changes #5843

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
1c83aca
Tunnel Manager changes
prsunny Nov 6, 2020
d323a76
Merge branch 'master' into tunnelmgr
prsunny Nov 26, 2020
dcba6a5
Merge remote-tracking branch 'upstream/master' into tunnelmgr
prsunny Dec 23, 2020
f4a4bc2
[Submodule] Update for sonic-swss
prsunny Dec 24, 2020
e3ce4c3
Merge remote-tracking branch 'upstream/master' into tunnelmgr
prsunny Dec 24, 2020
998b37c
Merge remote-tracking branch 'upstream/master' into tunnelmgr
prsunny Dec 24, 2020
3690c1a
[build]: add arch name in sonic-slave docker image
lguohan Dec 25, 2020
5d88ad2
Merge remote-tracking branch 'upstream/master' into tunnelmgr
prsunny Dec 25, 2020
3fde583
Merge remote-tracking branch 'upstream/master' into tunnelmgr
prsunny Dec 25, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions dockers/docker-orchagent/base_image_files/monit_swss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
## nbrmgrd
## vxlanmgrd
## coppmgrd
## tunnelmgrd

##############################################################################
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
Expand Down Expand Up @@ -45,3 +47,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"
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 change: 1 addition & 0 deletions dockers/docker-orchagent/critical_processes
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,4 @@ program:vrfmgrd
program:nbrmgrd
program:vxlanmgrd
program:coppmgrd
program:tunnelmgrd
10 changes: 10 additions & 0 deletions dockers/docker-orchagent/supervisord.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,16 @@ stderr_logfile=syslog
dependent_startup=true
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]
command=/usr/bin/enable_counters.py
priority=12
Expand Down
2 changes: 2 additions & 0 deletions platform/vs/docker-sonic-vs/start.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,8 @@ supervisorctl start natmgrd

supervisorctl start natsyncd

supervisorctl start tunnelmgrd

# Start arp_update when VLAN exists
VLAN=`sonic-cfggen -d -v 'VLAN.keys() | join(" ") if VLAN'`
if [ "$VLAN" != "" ]; then
Expand Down
8 changes: 8 additions & 0 deletions platform/vs/docker-sonic-vs/supervisord.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,3 +220,11 @@ autostart=false
autorestart=false
stdout_logfile=syslog
stderr_logfile=syslog

[program:tunnelmgrd]
command=/usr/bin/tunnelmgrd
priority=25
autostart=false
autorestart=false
stdout_logfile=syslog
stderr_logfile=syslog