[mux]: Make write_standby available on host

Signed-off-by: Lawrence Lee <lawlee@microsoft.com>

[write_standby]: Cleanup and fix build

Signed-off-by: Lawrence Lee <lawlee@microsoft.com>

dockers/docker-mux/Dockerfile.j2

@@ -29,7 +29,6 @@ COPY ["docker-init.sh", "/usr/bin/"]
 COPY ["supervisord.conf", "/etc/supervisor/conf.d/"]
 COPY ["files/supervisor-proc-exit-listener", "/usr/bin"]
 COPY ["critical_processes", "/etc/supervisor/"]
-COPY ["write_standby.py", "/usr/sbin/"]
 
 ## Copy all Jinja2 template files into the templates folder
 COPY ["*.j2", "/usr/share/sonic/templates/"]

dockers/docker-mux/supervisord.conf

@@ -28,7 +28,7 @@ stderr_logfile=syslog
 dependent_startup=true
 
 [program:standby_init]
-command=/usr/sbin/write_standby.py
+command=/opt/write_standby/bin/write_standby.py
 priority=2
 autostart=false
 autorestart=false

files/build_templates/docker_image_ctl.j2

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

files/build_templates/mux.service.j2

@@ -12,6 +12,7 @@ User={{ sonicadmin_user }}
 ExecStartPre=/usr/bin/{{docker_container_name}}.sh start
 ExecStart=/usr/bin/{{docker_container_name}}.sh wait
 ExecStop=/usr/bin/{{docker_container_name}}.sh stop
+ExecStopPost=/opt/write_standby/bin/write_standby.py
 Restart=always
 RestartSec=30
 

files/build_templates/sonic_debian_extension.j2

@@ -53,6 +53,7 @@ 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_ETC="$FILESYSTEM_ROOT/etc"
 FILESYSTEM_ROOT_ETC_SONIC="$FILESYSTEM_ROOT_ETC/sonic"
+FILESYSTEM_ROOT_OPT="$FILESYSTEM_ROOT/opt"
 
 GENERATED_SERVICE_FILE="$FILESYSTEM_ROOT/etc/sonic/generated_services.conf"
 
@@ -813,6 +814,10 @@ sudo LANG=C cp $SCRIPTS_DIR/asic_status.py $FILESYSTEM_ROOT/usr/local/bin/asic_s
 # Copy sonic-netns-exec script
 sudo LANG=C cp $SCRIPTS_DIR/sonic-netns-exec $FILESYSTEM_ROOT/usr/bin/sonic-netns-exec
 
+# 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_OPT/write_standby/bin/write_standby.py
+
 # Copy systemd timer configuration
 # It implements delayed start of services
 sudo cp $BUILD_TEMPLATES/snmp.timer $FILESYSTEM_ROOT_USR_LIB_SYSTEMD_SYSTEM

files/scripts/write_standby.py

@@ -1,10 +1,9 @@
 #!/usr/bin/env python3
 
-import logging
 import time
 
 from swsscommon.swsscommon import ConfigDBConnector, DBConnector, FieldValuePairs, ProducerStateTable, SonicV2Connector
-from swsscommon.swsscommon import APPL_DB, ASIC_DB
+from swsscommon.swsscommon import APPL_DB 
 
 logger = logging.getLogger(__name__)