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

[mux]: Call write_standby from host only

Browse Source 
Signed-off-by: Lawrence Lee <lawlee@microsoft.com>
This commit is contained in:
Lawrence Lee 2021-05-05 06:14:48 +00:00 committed by Ying Xie
parent 25712c712e
commit 77378b4364
4 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dockers/docker-mux/supervisord.conf
View File

@ -27,15 +27,6 @@ stdout_logfile=syslog
stderr_logfile=syslog stderr_logfile=syslog
dependent_startup=true dependent_startup=true
[program:standby_init]
command=/opt/write_standby/bin/write_standby.py
priority=2
autostart=false
autorestart=false
startsecs=0
dependent_startup=true
dependent_startup_wait_for=rsyslogd:running
[program:linkmgrd] [program:linkmgrd]
command=nice -n -20 /usr/sbin/linkmgrd -v warning command=nice -n -20 /usr/sbin/linkmgrd -v warning
priority=2 priority=2

3
files/build_templates/docker_image_ctl.j2
View File

@ -389,9 +389,6 @@ start() {
-v /var/run/redis-chassis:/var/run/redis-chassis:ro \ -v /var/run/redis-chassis:/var/run/redis-chassis:ro \
-v /usr/share/sonic/device/$PLATFORM/$HWSKU/$DEV:/usr/share/sonic/hwsku:ro \ -v /usr/share/sonic/device/$PLATFORM/$HWSKU/$DEV:/usr/share/sonic/hwsku:ro \
{%- endif %} {%- endif %}
{%- if docker_container_name == "mux" -%}
-v /opt/write_standby/bin:/opt/write_standby/bin:ro \
{%- endif -%}
$REDIS_MNT \ $REDIS_MNT \
-v /usr/share/sonic/device/$PLATFORM:/usr/share/sonic/platform:ro \ -v /usr/share/sonic/device/$PLATFORM:/usr/share/sonic/platform:ro \
{%- if sonic_asic_platform != "mellanox" %} {%- if sonic_asic_platform != "mellanox" %}

3
files/build_templates/mux.service.j2
View File

@ -9,10 +9,11 @@ StartLimitBurst=3
[Service] [Service]
User={{ sonicadmin_user }} User={{ sonicadmin_user }}
ExecStartPre=/usr/local/bin/write_standby.py
ExecStartPre=/usr/bin/{{docker_container_name}}.sh start ExecStartPre=/usr/bin/{{docker_container_name}}.sh start
ExecStart=/usr/bin/{{docker_container_name}}.sh wait ExecStart=/usr/bin/{{docker_container_name}}.sh wait
ExecStop=/usr/bin/{{docker_container_name}}.sh stop ExecStop=/usr/bin/{{docker_container_name}}.sh stop
ExecStopPost=/opt/write_standby/bin/write_standby.py ExecStopPost=/usr/local/bin/write_standby.py
Restart=always Restart=always
RestartSec=30 RestartSec=30

4
files/build_templates/sonic_debian_extension.j2
View File

@ -48,7 +48,6 @@ FILESYSTEM_ROOT_USR_SHARE_SONIC_TEMPLATES="$FILESYSTEM_ROOT_USR_SHARE_SONIC/temp
FILESYSTEM_ROOT_USR_SHARE_SONIC_FIRMWARE="$FILESYSTEM_ROOT_USR_SHARE_SONIC/firmware" FILESYSTEM_ROOT_USR_SHARE_SONIC_FIRMWARE="$FILESYSTEM_ROOT_USR_SHARE_SONIC/firmware"
FILESYSTEM_ROOT_ETC="$FILESYSTEM_ROOT/etc" FILESYSTEM_ROOT_ETC="$FILESYSTEM_ROOT/etc"
FILESYSTEM_ROOT_ETC_SONIC="$FILESYSTEM_ROOT_ETC/sonic" FILESYSTEM_ROOT_ETC_SONIC="$FILESYSTEM_ROOT_ETC/sonic"
FILESYSTEM_ROOT_OPT="$FILESYSTEM_ROOT/opt"
GENERATED_SERVICE_FILE="$FILESYSTEM_ROOT/etc/sonic/generated_services.conf" GENERATED_SERVICE_FILE="$FILESYSTEM_ROOT/etc/sonic/generated_services.conf"
@ -718,8 +717,7 @@ sudo LANG=C cp $SCRIPTS_DIR/radv.sh $FILESYSTEM_ROOT/usr/local/bin/radv.sh
sudo LANG=C cp $SCRIPTS_DIR/sonic-netns-exec $FILESYSTEM_ROOT/usr/bin/sonic-netns-exec sudo LANG=C cp $SCRIPTS_DIR/sonic-netns-exec $FILESYSTEM_ROOT/usr/bin/sonic-netns-exec
# Copy write_standby script for mux state # Copy write_standby script for mux state
sudo LANG=C mkdir -p $FILESYSTEM_ROOT_OPT/write_standby/bin/ sudo LANG=C cp $SCRIPTS_DIR/write_standby.py $FILESYSTEM_ROOT/usr/local/bin/write_standby.py
sudo LANG=C cp $SCRIPTS_DIR/write_standby.py $FILESYSTEM_ROOT_OPT/write_standby/bin/write_standby.py
# Copy systemd timer configuration # Copy systemd timer configuration
# It implements delayed start of services # It implements delayed start of services