diff --git a/openspec/changes/close-lab3-second-review-gaps/tasks.md b/openspec/changes/close-lab3-second-review-gaps/tasks.md index 3bf1aa55..1e5546bd 100644 --- a/openspec/changes/close-lab3-second-review-gaps/tasks.md +++ b/openspec/changes/close-lab3-second-review-gaps/tasks.md @@ -2,10 +2,10 @@ - [x] 1.1 `RequestPipeline`: отмена задачи → `request.cancelled`, `503 unavailable` в общем формате, если ответ не начат, затем отмена пробрасывается - [x] 1.2 `test_drain.py`: прерванный при остановке запрос — `503`, `application/json`, `error.code = unavailable`, `request_id` = `X-Request-Id`, непустой `X-Instance-Id` -- [ ] 1.3 Порт `Readiness`, адаптер `DatabaseReadiness` с флагом `DRAINING` в `shared/infrastructure/readiness.py`, сборка в `PlatformProvider`, маршрут `/health/ready` через порт; тест состава модулей ядра -- [ ] 1.4 `gunicorn_conf.py`: флаг из инфраструктуры, событие `service.draining` через `StructlogLogger`; `failover-evidence.sh` ищет его в логе -- [ ] 1.5 `openspec/config.yaml`: карта модулей (`readiness` за портом) -- [ ] 1.6 Проверка группы: `make lint`, `make student-test`, `make check` +- [x] 1.3 Порт `Readiness`, адаптер `DatabaseReadiness` с флагом `DRAINING` в `shared/infrastructure/readiness.py`, сборка в `PlatformProvider`, маршрут `/health/ready` через порт; тест состава модулей ядра +- [x] 1.4 `gunicorn_conf.py`: флаг из инфраструктуры, событие `service.draining` через `StructlogLogger`; `failover-evidence.sh` ищет его в логе +- [x] 1.5 `openspec/config.yaml`: карта модулей (`readiness` за портом) +- [x] 1.6 Проверка группы: `make lint`, `make student-test`, `make check` ## 2. Стенд и CI diff --git a/openspec/config.yaml b/openspec/config.yaml index 1c19278e..4f2bbbb1 100644 --- a/openspec/config.yaml +++ b/openspec/config.yaml @@ -50,14 +50,14 @@ context: | main.py сборка приложения: собирает вклады зон в один процесс migrate.py одноразовая точка входа: применяет SQL-миграции под advisory lock gunicorn_conf.py конфигурация процесса: воркеры, окно вывода из ротации по SIGTERM - (DrainingServer, MessengerWorker; флаг готовности — shared/entrypoints/health) + (DrainingServer, MessengerWorker; флаг вывода — shared/infrastructure/readiness) identity/ пользователи, пароли и сессии: ошибки, события, команды, значения, порты, адаптеры PostgreSQL/Valkey/Argon2 и весь свой HTTP-слой, включая аутентификацию messaging/ чаты, история и идемпотентная отправка: ошибки, события, команды, агрегат Chat, курсор, адаптеры PostgreSQL и весь свой HTTP-слой shared/ только платформа: domain / application / infrastructure (часы, id, журнал, - пул PostgreSQL, UoW-база) и entrypoints/ (конвейер, health, ошибки, настройки, - идентификатор реплики) + пул PostgreSQL, UoW-база, готовность за портом Readiness) и entrypoints/ + (конвейер, health, ошибки, настройки, идентификатор реплики) Стрелки указывают внутрь: `domain/` не импортирует инфраструктуру, `application/` зависит только от портов, адаптеры подключаются в `ioc.py` зоны. Ядро `shared/` не импортирует веб-фреймворк. diff --git a/scripts/failover-evidence.sh b/scripts/failover-evidence.sh index 68a98ce0..805cb513 100755 --- a/scripts/failover-evidence.sh +++ b/scripts/failover-evidence.sh @@ -21,7 +21,7 @@ since=$(date -u +%FT%TZ) stopped=$(replicas | awk '$2 == "exited" {print $1}') { echo "== stopped replica: $stopped; shutdown: signal, drain window with readiness 503, close, exit" - docker logs --since "$since" "$stopped" 2>&1 | grep -E 'Handling signal|Draining|"status":503|Shutting down|Waiting for conn|Finished server|service.stopped|SIGTERM' | tail -16 + docker logs --since "$since" "$stopped" 2>&1 | grep -E 'Handling signal|service.draining|"status":503|Shutting down|Waiting for conn|Finished server|service.stopped|SIGTERM' | tail -16 echo "\$ scripts/restore.sh" scripts/restore.sh echo "== after restore" diff --git a/src/messenger/gunicorn_conf.py b/src/messenger/gunicorn_conf.py index 71e748c8..140d5880 100644 --- a/src/messenger/gunicorn_conf.py +++ b/src/messenger/gunicorn_conf.py @@ -1,5 +1,4 @@ import asyncio -import logging import os import sys from typing import Any @@ -10,12 +9,13 @@ from uvicorn.server import Server from uvicorn_worker import UvicornWorker from messenger.main import LOG_FIELDS -from messenger.shared.entrypoints.health import DRAINING -from messenger.shared.infrastructure.logging import configure +from messenger.shared.infrastructure.logging import StructlogLogger, configure +from messenger.shared.infrastructure.readiness import DRAINING LOG_LEVEL = os.environ.get("LOG_LEVEL", "INFO") SHUTDOWN_SECONDS = int(os.environ.get("SHUTDOWN_TIMEOUT_SECONDS", "6")) DRAIN_SECONDS = float(os.environ.get("DRAIN_SECONDS", "2")) +LOGGER = StructlogLogger(level=LOG_LEVEL, allowed_fields=LOG_FIELDS) class StructlogGunicornLogger(GunicornBaseLogger): @@ -31,7 +31,7 @@ class DrainingServer(Server): await super().main_loop() if not self.force_exit: DRAINING.set() - logging.getLogger("uvicorn.error").info("Draining for %.1f s", DRAIN_SECONDS) + LOGGER.info("service.draining", limit=DRAIN_SECONDS) await asyncio.sleep(DRAIN_SECONDS) diff --git a/src/messenger/shared/application/ports.py b/src/messenger/shared/application/ports.py index 16586867..53a4df3d 100644 --- a/src/messenger/shared/application/ports.py +++ b/src/messenger/shared/application/ports.py @@ -26,6 +26,11 @@ class Logger(Protocol): def error(self, event: str, /, **fields: Any) -> None: ... +@runtime_checkable +class Readiness(Protocol): + async def check(self) -> None: ... + + @runtime_checkable class UnitOfWork(Protocol): def transaction(self) -> AbstractAsyncContextManager[None]: ... diff --git a/src/messenger/shared/entrypoints/health.py b/src/messenger/shared/entrypoints/health.py index b2da72c9..2986ccc7 100644 --- a/src/messenger/shared/entrypoints/health.py +++ b/src/messenger/shared/entrypoints/health.py @@ -1,14 +1,10 @@ -from threading import Event - from dishka.integrations.fastapi import FromDishka, inject from fastapi import APIRouter -from messenger.shared.application.errors import Unavailable +from messenger.shared.application.ports import Readiness from messenger.shared.entrypoints.schemas import HealthOut -from messenger.shared.infrastructure.postgres import Database router = APIRouter(tags=["health"]) -DRAINING = Event() @router.get("/health/live") @@ -18,8 +14,6 @@ async def live() -> HealthOut: @router.get("/health/ready") @inject -async def ready(database: FromDishka[Database]) -> HealthOut: - if DRAINING.is_set(): - raise Unavailable("Реплика выходит из ротации") - await database.ping() +async def ready(readiness: FromDishka[Readiness]) -> HealthOut: + await readiness.check() return HealthOut() diff --git a/src/messenger/shared/entrypoints/ioc.py b/src/messenger/shared/entrypoints/ioc.py index 2c99ab1b..9a86fe18 100644 --- a/src/messenger/shared/entrypoints/ioc.py +++ b/src/messenger/shared/entrypoints/ioc.py @@ -3,11 +3,12 @@ from collections.abc import AsyncIterator from dishka import Provider, Scope, provide from messenger.shared.application.messagebus import EventBus, InMemoryEventPublisher -from messenger.shared.application.ports import Clock, EventPublisher, IdGenerator, Logger +from messenger.shared.application.ports import Clock, EventPublisher, IdGenerator, Logger, Readiness from messenger.shared.config import PlatformSettings from messenger.shared.infrastructure.clock import MonotonicUtcClock from messenger.shared.infrastructure.ids import Uuid7Generator from messenger.shared.infrastructure.postgres import Database +from messenger.shared.infrastructure.readiness import DatabaseReadiness class PlatformProvider(Provider): @@ -45,6 +46,10 @@ class PlatformProvider(Provider): yield database await database.close() + @provide(scope=Scope.APP) + def readiness(self, database: Database) -> Readiness: + return DatabaseReadiness(database) + @provide(scope=Scope.APP) def event_bus(self, logger: Logger, settings: PlatformSettings) -> EventBus: return EventBus(logger, max_queue=settings.event_queue_max) diff --git a/src/messenger/shared/infrastructure/readiness.py b/src/messenger/shared/infrastructure/readiness.py new file mode 100644 index 00000000..4a2a02f7 --- /dev/null +++ b/src/messenger/shared/infrastructure/readiness.py @@ -0,0 +1,19 @@ +from threading import Event + +from messenger.shared.application.errors import Unavailable +from messenger.shared.infrastructure.postgres import Database + +DRAINING = Event() + + +class DatabaseReadiness: + __slots__ = ("_database", "_draining") + + def __init__(self, database: Database, draining: Event = DRAINING) -> None: + self._database = database + self._draining = draining + + async def check(self) -> None: + if self._draining.is_set(): + raise Unavailable("Реплика выходит из ротации") + await self._database.ping() diff --git a/student-tests/api/test_bounded_contexts.py b/student-tests/api/test_bounded_contexts.py index 0ab7edaa..3a5bbabe 100644 --- a/student-tests/api/test_bounded_contexts.py +++ b/student-tests/api/test_bounded_contexts.py @@ -95,6 +95,7 @@ def test_shared_core_holds_only_platform() -> None: "ids.py", "logging.py", "postgres.py", + "readiness.py", } diff --git a/student-tests/api/test_drain.py b/student-tests/api/test_drain.py index f9c022b5..52e431f3 100644 --- a/student-tests/api/test_drain.py +++ b/student-tests/api/test_drain.py @@ -9,7 +9,7 @@ import time import httpx from conftest import DATABASE, new_user -from messenger.shared.entrypoints.health import DRAINING +from messenger.shared.infrastructure.readiness import DRAINING DRAIN = 1.0 SHUTDOWN = 3