Move RADV fastboot handling to a service script (#5108)
* New /usr/local/bin/ script to start/stop radv service
This commit is contained in:
parent
a5d798257e
commit
31d7f27b4b
@ -8,9 +8,9 @@ StartLimitBurst=3
|
|||||||
|
|
||||||
[Service]
|
[Service]
|
||||||
User={{ sonicadmin_user }}
|
User={{ sonicadmin_user }}
|
||||||
ExecStartPre=/usr/bin/{{ docker_container_name }}.sh start
|
ExecStartPre=/usr/local/bin/{{ docker_container_name }}.sh start
|
||||||
ExecStart=/usr/bin/{{ docker_container_name }}.sh wait
|
ExecStart=/usr/local/bin/{{ docker_container_name }}.sh wait
|
||||||
ExecStop=/usr/bin/{{ docker_container_name }}.sh stop
|
ExecStop=/usr/local/bin/{{ docker_container_name }}.sh stop
|
||||||
Restart=always
|
Restart=always
|
||||||
RestartSec=30
|
RestartSec=30
|
||||||
|
|
||||||
|
@ -516,10 +516,11 @@ sudo LANG=C chroot $FILESYSTEM_ROOT fuser -km /sys || true
|
|||||||
sudo LANG=C chroot $FILESYSTEM_ROOT umount -lf /sys
|
sudo LANG=C chroot $FILESYSTEM_ROOT umount -lf /sys
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
# Copy swss and syncd service script
|
# Copy service scripts (swss, syncd, bgp, radv)
|
||||||
sudo LANG=C cp $SCRIPTS_DIR/swss.sh $FILESYSTEM_ROOT/usr/local/bin/swss.sh
|
sudo LANG=C cp $SCRIPTS_DIR/swss.sh $FILESYSTEM_ROOT/usr/local/bin/swss.sh
|
||||||
sudo LANG=C cp $SCRIPTS_DIR/syncd.sh $FILESYSTEM_ROOT/usr/local/bin/syncd.sh
|
sudo LANG=C cp $SCRIPTS_DIR/syncd.sh $FILESYSTEM_ROOT/usr/local/bin/syncd.sh
|
||||||
sudo LANG=C cp $SCRIPTS_DIR/bgp.sh $FILESYSTEM_ROOT/usr/local/bin/bgp.sh
|
sudo LANG=C cp $SCRIPTS_DIR/bgp.sh $FILESYSTEM_ROOT/usr/local/bin/bgp.sh
|
||||||
|
sudo LANG=C cp $SCRIPTS_DIR/radv.sh $FILESYSTEM_ROOT/usr/local/bin/radv.sh
|
||||||
|
|
||||||
# Copy sonic-netns-exec script
|
# Copy sonic-netns-exec script
|
||||||
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
|
||||||
|
84
files/scripts/radv.sh
Normal file
84
files/scripts/radv.sh
Normal file
@ -0,0 +1,84 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
function debug()
|
||||||
|
{
|
||||||
|
/usr/bin/logger $1
|
||||||
|
/bin/echo `date` "- $1" >> ${DEBUGLOG}
|
||||||
|
}
|
||||||
|
|
||||||
|
function check_warm_boot()
|
||||||
|
{
|
||||||
|
SYSTEM_WARM_START=`$SONIC_DB_CLI STATE_DB hget "WARM_RESTART_ENABLE_TABLE|system" enable`
|
||||||
|
SERVICE_WARM_START=`$SONIC_DB_CLI STATE_DB hget "WARM_RESTART_ENABLE_TABLE|${SERVICE}" enable`
|
||||||
|
if [[ x"$SYSTEM_WARM_START" == x"true" ]] || [[ x"$SERVICE_WARM_START" == x"true" ]]; then
|
||||||
|
WARM_BOOT="true"
|
||||||
|
else
|
||||||
|
WARM_BOOT="false"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
function check_fast_boot ()
|
||||||
|
{
|
||||||
|
if [[ $($SONIC_DB_CLI STATE_DB GET "FAST_REBOOT|system") == "1" ]]; then
|
||||||
|
FAST_BOOT="true"
|
||||||
|
else
|
||||||
|
FAST_BOOT="false"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
start() {
|
||||||
|
debug "Starting ${SERVICE}$DEV service..."
|
||||||
|
|
||||||
|
check_warm_boot
|
||||||
|
check_fast_boot
|
||||||
|
debug "Warm boot flag: ${SERVICE}$DEV ${WARM_BOOT}."
|
||||||
|
debug "Fast boot flag: ${SERVICE}$DEV ${FAST_BOOT}."
|
||||||
|
|
||||||
|
# start service docker
|
||||||
|
/usr/bin/${SERVICE}.sh start $DEV
|
||||||
|
debug "Started ${SERVICE}$DEV service..."
|
||||||
|
}
|
||||||
|
|
||||||
|
wait() {
|
||||||
|
/usr/bin/${SERVICE}.sh wait $DEV
|
||||||
|
}
|
||||||
|
|
||||||
|
stop() {
|
||||||
|
debug "Stopping ${SERVICE}$DEV service..."
|
||||||
|
|
||||||
|
check_warm_boot
|
||||||
|
check_fast_boot
|
||||||
|
debug "Warm boot flag: ${SERVICE}$DEV ${WARM_BOOT}."
|
||||||
|
debug "Fast boot flag: ${SERVICE}$DEV ${FAST_BOOT}."
|
||||||
|
|
||||||
|
# For WARM/FAST boot do not perform service stop
|
||||||
|
if [[ x"$WARM_BOOT" != x"true" ]] && [[ x"$FAST_BOOT" != x"true" ]]; then
|
||||||
|
/usr/bin/${SERVICE}.sh stop $DEV
|
||||||
|
debug "Stopped ${SERVICE}$DEV service..."
|
||||||
|
else
|
||||||
|
debug "Killing Docker radv..."
|
||||||
|
/usr/bin/docker kill radv &> /dev/null || debug "Docker radv is not running ($?) ..."
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
DEV=$2
|
||||||
|
|
||||||
|
SERVICE="radv"
|
||||||
|
DEBUGLOG="/tmp/radv-debug$DEV.log"
|
||||||
|
NAMESPACE_PREFIX="asic"
|
||||||
|
if [ "$DEV" ]; then
|
||||||
|
NET_NS="$NAMESPACE_PREFIX$DEV" #name of the network namespace
|
||||||
|
SONIC_DB_CLI="sonic-db-cli -n $NET_NS"
|
||||||
|
else
|
||||||
|
SONIC_DB_CLI="sonic-db-cli"
|
||||||
|
fi
|
||||||
|
|
||||||
|
case "$1" in
|
||||||
|
start|wait|stop)
|
||||||
|
$1
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
echo "Usage: $0 {start|wait|stop}"
|
||||||
|
exit 1
|
||||||
|
;;
|
||||||
|
esac
|
Reference in New Issue
Block a user