Skip to content

Commit

Permalink
Revert "Revert "[scripts/fast-reboot] Shutdown remaining containers t…
Browse files Browse the repository at this point in the history
…hrough systemd (#2133)" (#2161)" (#2184)

Reverts #2161
Revert a revert. This must be merged together with sonic-net/sonic-buildimage#10510
  • Loading branch information
stepanblyschak authored Jul 25, 2022
1 parent 27667cf commit 8f4fc62
Showing 1 changed file with 0 additions and 20 deletions.
20 changes: 0 additions & 20 deletions scripts/fast-reboot
Original file line number Diff line number Diff line change
Expand Up @@ -748,26 +748,6 @@ for service in ${SERVICES_TO_STOP}; do
fi
done
# Kill other containers to make the reboot faster
# We call `docker kill ...` to ensure the container stops as quickly as possible,
# then immediately call `systemctl stop ...` to prevent the service from
# restarting the container automatically.
debug "Stopping all remaining containers ..."
if test -f /usr/local/bin/ctrmgr_tools.py
then
/usr/local/bin/ctrmgr_tools.py kill-all
else
for CONTAINER_NAME in $(docker ps --format '{{.Names}}'); do
CONTAINER_STOP_RC=0
docker kill $CONTAINER_NAME &> /dev/null || CONTAINER_STOP_RC=$?
systemctl stop $CONTAINER_NAME || debug "Ignore stopping $CONTAINER_NAME error $?"
if [[ CONTAINER_STOP_RC -ne 0 ]]; then
debug "Failed killing container $CONTAINER_NAME RC $CONTAINER_STOP_RC ."
fi
done
fi
debug "Stopped all remaining containers ..."
# Stop the docker container engine. Otherwise we will have a broken docker storage
systemctl stop docker.service || debug "Ignore stopping docker service error $?"
Expand Down

0 comments on commit 8f4fc62

Please sign in to comment.