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

Change fast-reboot script to use swss and radv service script #1036

Merged
merged 2 commits into from
Aug 14, 2020
Merged
Changes from all 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
11 changes: 4 additions & 7 deletions scripts/fast-reboot
Original file line number Diff line number Diff line change
Expand Up @@ -503,9 +503,9 @@ systemctl stop nat
debug "Stopped nat ..."

# Kill radv before stopping BGP service to prevent annoucing our departure.
debug "Stopping radv ..."
docker kill radv &>/dev/null || [ $? == 1 ]
debug "Stopping radv service..."
systemctl stop radv
debug "Stopped radv service..."

# Kill bgpd to start the bgp graceful restart procedure
debug "Stopping bgp ..."
Expand Down Expand Up @@ -536,12 +536,9 @@ if [[ "$REBOOT_TYPE" = "fast-reboot" ]]; then
debug "Stopped teamd ..."
fi

# Kill swss Docker container
# We call `docker kill swss` to ensure the container stops as quickly as possible,
# then immediately call `systemctl stop swss` to prevent the service from
# restarting the container automatically.
docker kill swss &> /dev/null || debug "Docker swss is not running ($?) ..."
debug "Stopping swss service ..."
systemctl stop swss
debug "Stopped swss service ..."

# Pre-shutdown syncd
if [[ "$REBOOT_TYPE" = "warm-reboot" || "$REBOOT_TYPE" = "fastfast-reboot" ]]; then
Expand Down