CI / lint (push) Successful in 3s
CI / extension-version (push) Successful in 3s
Build images / sign-extension (push) Successful in 4s
Build images / build-agent (push) Successful in 7s
CI / frontend-build (push) Successful in 23s
CI / backend-lint-and-test (push) Successful in 36s
Build images / build-web (push) Successful in 1m9s
Build images / smoke-web (push) Skipped
Build images / build-ml (push) Successful in 2m8s
Build images / promote (push) Skipped
CI / integration (push) Successful in 2m37s
Milestone 422 step 5. `docker compose -f docker-compose.single.yml up -d` gives three containers — FabledCurator, Postgres, Redis — where the stack previously needed seven. THE MULTI-SERVICE STACK IS KEPT. docker-compose.yml still runs the five app services separately and remains the right shape for a Swarm deployment spread across hosts, where per-service rolling rollback and placement constraints matter. This adds a compose file; it deletes none. `entrypoint.sh all` GENERATES the supervisord config from worker_lanes.LANES and execs it as PID 1. Generated rather than checked in because a static .conf would spell out each lane's -Q list, making a FIFTH hand-kept copy of the queue names — after celery_app.task_routes and the three collapsed in steps 1, 2 and 4. Every one of those had already drifted when found. Generating gives a stronger guarantee than "they match today": a lane added to LANES gets a process, and a queue cannot end up with no consumer because someone missed a file. supervisord over s6-overlay: one pip dependency on an image already Python, with per-program stop timeouts and stopasgroup. The process-group part is not a detail — celery's prefork pool forks children, and a TERM reaching only the parent leaves them orphaned holding tasks. s6's advantage (PID-1 signal and zombie handling) comes from `init: true` instead. Nothing in FC talks to the supervisor, so the choice is reversible without touching product code. FOUR LANES, NOT FIVE. The ml lane is skipped: torch and the ML requirements live only in Dockerfile.ml until step 6 merges the images, so an `ml` program here would fail to import on every restart forever. `--with-ml` is the flag step 6 turns on. THREE BUGS FOUND BY READING IT BACK, none of which the first tests caught: 1. `environment=CELERY_QUEUES=default,import,thumbnail,download` — supervisord parses that key as a COMMA-separated list, so it reads as CELERY_QUEUES=default plus three malformed entries and the worker lane would have consumed only `default`. Silent: the worker starts, reports healthy, never picks up an import. Now quoted, and the test asserts the quoted form rather than the bare substring, which passed either way. 2. The generator emitted `entrypoint.sh <lane.name>`, but `maintenance_long` is not a role — compose runs it as the plain `worker` role with different queues. Lane now carries `entrypoint_role`, and a test reads entrypoint.sh to assert every role a lane names actually exists. 3. The `scheduler` role hardcoded --concurrency=1, ignoring CELERY_CONCURRENCY. Harmless while only compose started it and set none; with a generated value being passed, the lane would have sat at 1 until the reconcile noticed, with nothing saying why. The healthcheck asserts BOTH halves — hypercorn answers and every configured lane is answering the broker. That is the failure mode consolidation creates: docker can no longer see the lanes as separate services, so a web-only check would report a healthy container with every lane inside it dead. It deliberately ignores the `enabled` flag: a disabled lane still has a running process with its consumers cancelled, and marking the container unhealthy for turning tagging off would be wrong. stop_grace_period 200s, sized to the slowest lane (maintenance_long at 180s) rather than the average, with a test asserting no program's stopwaitsecs can exceed what compose allows. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01LVjrnpQjRgHdvq95rASoiR
97 lines
3.6 KiB
Bash
Executable File
97 lines
3.6 KiB
Bash
Executable File
#!/usr/bin/env bash
|
|
set -euo pipefail
|
|
|
|
ROLE="${1:-web}"
|
|
shift || true
|
|
|
|
case "$ROLE" in
|
|
web)
|
|
echo "[entrypoint] Running alembic upgrade head"
|
|
alembic upgrade head
|
|
echo "[entrypoint] Starting hypercorn on :8080"
|
|
# create_app is a factory — the `()` tells hypercorn to call it once
|
|
# and serve the returned Quart (ASGI) app, rather than treating the
|
|
# function itself as the application (which it then mis-invokes as WSGI).
|
|
# Default 4 workers (was 2): each worker is one asyncio loop, and a large
|
|
# file download occupies its worker for the transfer — 2 was too few once the
|
|
# GPU agent + the browser's thumbnail grid hit /images concurrently (they
|
|
# queued behind each other). Env-tunable via HYPERCORN_WORKERS.
|
|
exec hypercorn \
|
|
--bind 0.0.0.0:8080 \
|
|
--workers "${HYPERCORN_WORKERS:-4}" \
|
|
--access-logfile - \
|
|
"backend.app:create_app()"
|
|
;;
|
|
|
|
worker)
|
|
QUEUES="${CELERY_QUEUES:-default,import,thumbnail}"
|
|
CONCURRENCY="${CELERY_CONCURRENCY:-2}"
|
|
echo "[entrypoint] Starting Celery worker queues=$QUEUES concurrency=$CONCURRENCY"
|
|
exec celery -A backend.app.celery_app:celery worker \
|
|
--loglevel=info \
|
|
-Q "$QUEUES" \
|
|
--concurrency="$CONCURRENCY"
|
|
;;
|
|
|
|
scheduler)
|
|
QUEUES="${CELERY_QUEUES:-maintenance,scan}"
|
|
# Honours CELERY_CONCURRENCY like the `worker` role does. It was hardcoded
|
|
# to 1, which was harmless while only compose started this lane and set no
|
|
# concurrency for it — but the generated supervisord config (milestone 422
|
|
# step 5) passes one, and a value silently ignored at boot would leave the
|
|
# lane at 1 until the reconcile sweep noticed, with nothing saying why.
|
|
CONCURRENCY="${CELERY_CONCURRENCY:-1}"
|
|
echo "[entrypoint] Starting Celery beat+worker queues=$QUEUES concurrency=$CONCURRENCY"
|
|
exec celery -A backend.app.celery_app:celery worker \
|
|
--beat \
|
|
--loglevel=info \
|
|
-Q "$QUEUES" \
|
|
--concurrency="$CONCURRENCY"
|
|
;;
|
|
|
|
ml-worker)
|
|
echo "[entrypoint] Ensuring ML models present in /models..."
|
|
python -m backend.app.scripts.download_models
|
|
echo "[entrypoint] Starting ML Celery worker (ml queue)"
|
|
exec celery -A backend.app.celery_app:celery worker \
|
|
--loglevel=info \
|
|
-Q ml \
|
|
--concurrency=1
|
|
;;
|
|
|
|
all)
|
|
# The single-container layout (milestone 422 step 5): hypercorn plus one
|
|
# celery process per lane, under supervisord, in one container beside
|
|
# Postgres and Redis.
|
|
#
|
|
# The config is GENERATED from services/worker_lanes.LANES rather than
|
|
# checked in, so the processes this container runs and the lanes the
|
|
# application believes in cannot disagree — see the generator's docstring
|
|
# for why a static .conf would have been a fifth copy of the queue names.
|
|
#
|
|
# supervisord is PID 1 here and never reads the database. Every lane boots
|
|
# at its LANES default; the reconcile sweep raises it to whatever the
|
|
# operator stored, within one tick. That ordering is deliberate: settings
|
|
# adjust a baseline that already works, and can never prevent a boot.
|
|
CONF="${SUPERVISOR_CONF:-/tmp/supervisord.conf}"
|
|
echo "[entrypoint] Generating $CONF from the lane table"
|
|
python -m backend.app.scripts.gen_supervisord ${FC_WITH_ML:+--with-ml} > "$CONF"
|
|
echo "[entrypoint] Starting supervisord (web + worker lanes)"
|
|
exec supervisord -c "$CONF"
|
|
;;
|
|
|
|
shell|bash)
|
|
exec /bin/bash "$@"
|
|
;;
|
|
|
|
alembic)
|
|
exec alembic "$@"
|
|
;;
|
|
|
|
*)
|
|
echo "[entrypoint] Unknown role: $ROLE" >&2
|
|
echo "[entrypoint] Valid roles: all | web | worker | scheduler | maintenance_long | ml | ml-worker | shell | alembic" >&2
|
|
exit 1
|
|
;;
|
|
esac
|