Skip to content
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.

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

Scheduled Configurations #3

Closed
wants to merge 7 commits into from
Closed
Show file tree
Hide file tree
Changes from 3 commits
Commits
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
4 changes: 3 additions & 1 deletion dockers/docker-orchagent/Dockerfile.j2
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@ RUN apt-get update && \
pciutils \
# Needed for installing netifaces Python package
build-essential \
python3-dev
python3-dev \
# Used for scheduledconfigmgrd
cron

{% if ( CONFIGURED_ARCH == "armhf" or CONFIGURED_ARCH == "arm64" ) %}
# Fix for gcc/python/iputils-ping not found in arm docker
Expand Down
3 changes: 3 additions & 0 deletions dockers/docker-orchagent/critical_processes.j2
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,7 @@ program:nbrmgrd
program:vxlanmgrd
program:coppmgrd
program:tunnelmgrd
program:timerangemgrd
program:scheduledconfigmgrd
program:cron
{%- endif %}
45 changes: 45 additions & 0 deletions dockers/docker-orchagent/supervisord.conf.j2
Original file line number Diff line number Diff line change
Expand Up @@ -302,3 +302,48 @@ dependent_startup_wait_for=swssconfig:exited
environment=ASAN_OPTIONS="log_path=/var/log/asan/fdbsyncd-asan.log{{ asan_extra_options }}"
{% endif %}
{%- endif %}

{% if is_fabric_asic == 0 %}
[program:timerangemgrd]
command=/usr/bin/timerangemgrd
priority=18
autostart=false
autorestart=false
stdout_logfile=syslog
stderr_logfile=syslog
dependent_startup=true
dependent_startup_wait_for=swssconfig:exited
{% if ENABLE_ASAN == "y" %}
environment=ASAN_OPTIONS="log_path=/var/log/asan/timerangemgrd-asan.log{{ asan_extra_options }}"
{% endif %}
{%- endif %}

{% if is_fabric_asic == 0 %}
[program:scheduledconfigmgrd]
command=/usr/bin/scheduledconfigmgrd
priority=18
autostart=false
autorestart=false
stdout_logfile=syslog
stderr_logfile=syslog
dependent_startup=true
dependent_startup_wait_for=swssconfig:exited
{% if ENABLE_ASAN == "y" %}
environment=ASAN_OPTIONS="log_path=/var/log/asan/scheduledconfigmgrd-asan.log{{ asan_extra_options }}"
{% endif %}
{%- endif %}

{% if is_fabric_asic == 0 %}
[program:cron]
command=/usr/sbin/cron -f -L 15
priority=18
autostart=false
autorestart=false
stdout_logfile=syslog
stderr_logfile=syslog
dependent_startup=true
dependent_startup_wait_for=swssconfig:exited
{% if ENABLE_ASAN == "y" %}
environment=ASAN_OPTIONS="log_path=/var/log/asan/cron-asan.log{{ asan_extra_options }}"
{% endif %}
{%- endif %}
6 changes: 6 additions & 0 deletions platform/vs/docker-sonic-vs/start.sh
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,12 @@ supervisorctl start tunnelmgrd

supervisorctl start fabricmgrd

supervisorctl start timerangemgrd

supervisorctl start scheduledconfigmgrd

supervisorctl start cron

# Start arp_update when VLAN exists
VLAN=`sonic-cfggen -d -v 'VLAN.keys() | join(" ") if VLAN'`
if [ "$VLAN" != "" ]; then
Expand Down
34 changes: 34 additions & 0 deletions platform/vs/docker-sonic-vs/supervisord.conf.j2
Original file line number Diff line number Diff line change
Expand Up @@ -325,3 +325,37 @@ stderr_logfile=syslog
{% if ENABLE_ASAN == "y" %}
environment=ASAN_OPTIONS="log_path=/var/log/asan/fabricmgrd-asan.log{{ asan_extra_options }}"
{% endif %}

[program:timerangemgrd]
command=/usr/bin/timerangemgrd
priority=27
autostart=false
autorestart=false
stdout_logfile=syslog
stderr_logfile=syslog
{% if ENABLE_ASAN == "y" %}
environment=ASAN_OPTIONS="log_path=/var/log/asan/timerangemgrd-asan.log{{ asan_extra_options }}"
{% endif %}

[program:scheduledconfigmgrd]
command=/usr/bin/scheduledconfigmgrd
priority=27
autostart=false
autorestart=false
stdout_logfile=syslog
stderr_logfile=syslog
{% if ENABLE_ASAN == "y" %}
environment=ASAN_OPTIONS="log_path=/var/log/asan/scheduledconfigmgrd-asan.log{{ asan_extra_options }}"
{% endif %}


[program:cron]
command=/usr/sbin/cron -f -L 15
priority=27
autostart=false
autorestart=false
stdout_logfile=syslog
stderr_logfile=syslog
{% if ENABLE_ASAN == "y" %}
environment=ASAN_OPTIONS="log_path=/var/log/asan/cron-asan.log{{ asan_extra_options }}"
{% endif %}