From e7867e31d0507f816753e9964a60615243bbbe9c Mon Sep 17 00:00:00 2001 From: Dror Prital Date: Wed, 11 May 2022 10:20:48 +0000 Subject: [PATCH] Revert "[scripts/fast-reboot] Shutdown remaining containers through systemd (#2133)" This reverts commit a5f55aa7060c2dff73627533ca489f7d29f51621. --- scripts/fast-reboot | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/scripts/fast-reboot b/scripts/fast-reboot index d5b6e204bd..5749e3745a 100755 --- a/scripts/fast-reboot +++ b/scripts/fast-reboot @@ -738,6 +738,26 @@ 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 $?"