jeans/operating-system
jeans/operating-system
1
0
Fork 0
mirror of https://github.com/home-assistant/operating-system.git synced 2025-07-27 15:06:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify self healing capabilities of Supervisor service (#952)

Browse Source 
* Simplify self healing capabilities of Supervisor service

Instead of relying on time based information on how long the container
has been running use a startup marker file to infer if the last startup
has been successful.

* Update buildroot-external/rootfs-overlay/usr/sbin/hassos-supervisor

Co-authored-by: Pascal Vizeli <pascal.vizeli@syshack.ch>

Co-authored-by: Pascal Vizeli <pascal.vizeli@syshack.ch>
This commit is contained in:
Stefan Agner 2020-11-04 10:05:38 +01:00 committed by GitHub
parent 8ed04ed73c
commit 2d257bd671
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
buildroot-external/rootfs-overlay/usr/lib/systemd/system/hassos-supervisor.service
View File

@ -8,6 +8,7 @@ StartLimitIntervalSec=60
StartLimitBurst=5
ConditionPathExists=/run/dbus/system_bus_socket
ConditionPathExists=/run/docker.sock
RuntimeDirectory=supervisor
[Service]
Type=simple

31
buildroot-external/rootfs-overlay/usr/sbin/hassos-supervisor
View File

@ -9,32 +9,21 @@ set -e
. /etc/os-release
# Init supervisor
SUPERVISOR_MIN_RUNTIME=15
SUPERVISOR_STARTUP_MARKER="/run/supervisor/startup-marker"
SUPERVISOR_IMAGE="homeassistant/${SUPERVISOR_ARCH}-hassio-supervisor"
SUPERVISOR_DATA=/mnt/data/supervisor
SUPERVISOR_IMAGE_ID=$(docker inspect --format='{{.Id}}' "${SUPERVISOR_IMAGE}" || echo "")
SUPERVISOR_CONTAINER_ID=$(docker inspect --format='{{.Image}}' hassio_supervisor || echo "")
# Check if previous runtime of the container meets the minimal runtime
# If not, we might be in trouble. Image or container corruption, bad release?
# Check if previous run left the startup-marker in place. If so, we assume the
# Container image or container is somehow corrupted.
# Delete the container, delete the image, pull a fresh one
if [ -n "${SUPERVISOR_CONTAINER_ID}" ] && [ "${SUPERVISOR_IMAGE_ID}" = "${SUPERVISOR_CONTAINER_ID}" ]; then
SUPERVISOR_START=$(docker inspect --format='{{.State.StartedAt}}' hassio_supervisor | sed -re "s/([-0-9]+)T([0-9\:]+).*/\1 \2/g")
SUPERVISOR_STOP=$(docker inspect --format='{{.State.FinishedAt}}' hassio_supervisor | sed -re "s/([-0-9]+)T([0-9\:]+).*/\1 \2/g")
if [ -n "${SUPERVISOR_START}" ] && [ -n "${SUPERVISOR_STOP}" ]; then
START=$(date --date="${SUPERVISOR_START}" +%s)
STOP=$(date --date="${SUPERVISOR_STOP}" +%s)
SUPERVISOR_RUNTIME=$((STOP-START))
# Minimial runtime not met, remove container and image
if [ "${SUPERVISOR_RUNTIME}" -lt "${SUPERVISOR_MIN_RUNTIME}" ]; then
echo "[WARNING] Supervisor container exited too quickly, forcing a fresh image and container..."
docker container rm --force hassio_supervisor || true
SUPERVISOR_CONTAINER_ID=""
docker rmi --force "${SUPERVISOR_IMAGE_ID}" || true
SUPERVISOR_IMAGE_ID=""
fi
fi
if [ -f "${SUPERVISOR_STARTUP_MARKER}" ]; then
echo "[WARNING] Supervisor container did not remove the startup marker file. Assuming container image or container corruption."
docker container rm --force hassio_supervisor || true
SUPERVISOR_CONTAINER_ID=""
docker rmi --force "${SUPERVISOR_IMAGE_ID}" || true
SUPERVISOR_IMAGE_ID=""
fi
# If Supervisor image is missing, pull it
@ -78,6 +67,7 @@ if [ -z "${SUPERVISOR_CONTAINER_ID}" ]; then
--privileged --security-opt apparmor="hassio-supervisor" \
-v /var/run/docker.sock:/var/run/docker.sock \
-v /var/run/dbus:/var/run/dbus \
-v /run/supervisor:/run/os:rw \
-v /etc/machine-id:/etc/machine-id:ro \
-v ${SUPERVISOR_DATA}:/data:rw \
-v /mnt/overlay:/os/overlay:rw \
@ -90,5 +80,6 @@ fi
# Run supervisor
mkdir -p ${SUPERVISOR_DATA}
touch ${SUPERVISOR_STARTUP_MARKER}
echo "[INFO] Starting the Supervisor..."
exec docker container start --attach hassio_supervisor