forked from mtusi2026/mtusi2026lab3
Compare commits
8
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c5d688431c | ||
|
|
dc7e1eeb15 | ||
|
|
b5e329042c | ||
|
|
4ca308d189 | ||
|
|
366fa7fa56 | ||
|
|
ee07e6c950 | ||
|
|
24fd38f0af | ||
|
|
46c829b730 |
+5
-2
@@ -9,5 +9,8 @@ DATABASE_URL_FILE=/run/secrets/database_url
|
|||||||
# Optional on 3, required use on 4 in lab2; Redis OR Valkey:
|
# Optional on 3, required use on 4 in lab2; Redis OR Valkey:
|
||||||
SESSION_STORE=postgres
|
SESSION_STORE=postgres
|
||||||
CACHE_URL_FILE=/run/secrets/cache_url
|
CACHE_URL_FILE=/run/secrets/cache_url
|
||||||
API_REPLICAS=2
|
POSTGRES_USER=messenger
|
||||||
IDEMPOTENCY_TTL_SECONDS=86400
|
POSTGRES_PASSWORD=messenger_password
|
||||||
|
POSTGRES_DB=messenger_db
|
||||||
|
DATABASE_URL=postgresql+asyncpg://messenger:messenger_password@db:5432/messenger_db
|
||||||
|
REDIS_URL=redis://redis:6379/0
|
||||||
|
|||||||
@@ -1,18 +1,50 @@
|
|||||||
## Лабораторная 3
|
## Лабораторная 3
|
||||||
|
|
||||||
Автор / группа: TODO
|
Автор / группа: Долда Кирилл / БПИ2301
|
||||||
Целевая оценка (3/4/5): TODO
|
Целевая оценка (3/4/5): 5
|
||||||
Трек 5, если заявлен: TODO
|
Трек 5, если заявлен: 1
|
||||||
|
|
||||||
Что реализовано и что перенесено: TODO
|
**Что реализовано и что перенесено:**
|
||||||
Команды запуска из чистого clone: TODO
|
|
||||||
Результаты проверок и ссылка на REPORT.md: TODO
|
|
||||||
Ограничения / известные ошибки: TODO
|
|
||||||
Источники и использование ИИ: TODO
|
|
||||||
|
|
||||||
- [ ] Весь обязательный минимум текущей и предыдущих работ сохранён с объявленными переходами.
|
Реализован стенд с двумя API-репликами (`app1`, `app2`) за балансировщиком Nginx, общими PostgreSQL и Redis.
|
||||||
- [ ] Контракт и публичные тесты не ослаблены.
|
|
||||||
- [ ] make check и make test выполнены; приложен реальный вывод.
|
**Команды запуска из чистого clone:**
|
||||||
- [ ] Сценарии отказов/безопасности своего уровня воспроизведены.
|
|
||||||
- [ ] Все секреты и приватные ключи находятся вне Git; отчёт не содержит tokens.
|
cp .env.example .env
|
||||||
- [ ] README задания сохранён, REPORT.md содержит инструкцию именно моего решения.
|
docker compose up -d --build
|
||||||
|
docker compose exec -w /app app1 alembic upgrade head
|
||||||
|
|
||||||
|
**Результаты проверок и ссылка на REPORT.md:**
|
||||||
|
|
||||||
|
make test — PASS: lab3 public API scenario.
|
||||||
|
|
||||||
|
make test-lab3 — PASS (3/3): идемпотентность (тот же id), идемпотентность (409), общая сессия (≥2 разных x-instance-id).
|
||||||
|
|
||||||
|
make test-security — PASS (3/3): неверный пароль → 401, logout → 401, expiry → 401.
|
||||||
|
|
||||||
|
make test-dependencies — PASS (2/2): БД → 503, Redis → 500 с Error.
|
||||||
|
|
||||||
|
make failover / make failover-app2 — все 20 запросов 200, ни одного 502 (failover ≤ 0.5 сек, меньше 10 сек).
|
||||||
|
|
||||||
|
make rolling-load + make rolling-update — все 200, без простоя.
|
||||||
|
|
||||||
|
Трек 1: RPS ~250–260 при 1/2/4 репликах; saturation point на 4 репликах (~260 RPS); 6 реплик → 257 (спад).
|
||||||
|
|
||||||
|
**Ограничения / известные ошибки:**
|
||||||
|
|
||||||
|
synchronous_commit=off — для демонстрации (риск потери 10–20 мс данных при жёстком падении хоста).
|
||||||
|
|
||||||
|
RPS ~250–260 — предел для текущего стенда
|
||||||
|
|
||||||
|
tests/load.py — погрешность в измерениях (RPS может немного изменяться).
|
||||||
|
|
||||||
|
**Источники и использование ИИ:**
|
||||||
|
|
||||||
|
FastAPI, SQLAlchemy, asyncpg, Alembic, passlib[bcrypt], redis, psycopg2-binary, pytest, nginx:alpine, postgres:16-alpine, redis:7-alpine.
|
||||||
|
|
||||||
|
- [ x ] Весь обязательный минимум текущей и предыдущих работ сохранён с объявленными переходами.
|
||||||
|
- [ x ] Контракт и публичные тесты не ослаблены.
|
||||||
|
- [ x ] make check и make test выполнены; приложен реальный вывод.
|
||||||
|
- [ x ] Сценарии отказов/безопасности своего уровня воспроизведены.
|
||||||
|
- [ x ] Все секреты и приватные ключи находятся вне Git; отчёт не содержит tokens.
|
||||||
|
- [ x ] README задания сохранён, REPORT.md содержит инструкцию именно моего решения.
|
||||||
|
|||||||
@@ -28,5 +28,6 @@ coverage/
|
|||||||
.DS_Store
|
.DS_Store
|
||||||
.idea/
|
.idea/
|
||||||
.vscode/
|
.vscode/
|
||||||
|
evidence/*.sql
|
||||||
# Keep small, sanitized evidence summaries in evidence/ under version control.
|
# Keep small, sanitized evidence summaries in evidence/ under version control.
|
||||||
# Inspect git diff --cached: ignore rules are not a secret scanner.
|
# Inspect git diff --cached: ignore rules are not a secret scanner.
|
||||||
|
|||||||
+24
@@ -0,0 +1,24 @@
|
|||||||
|
FROM python:3.13-slim
|
||||||
|
|
||||||
|
WORKDIR /app
|
||||||
|
|
||||||
|
COPY requirements-dev.txt .
|
||||||
|
RUN pip install --no-cache-dir -r requirements-dev.txt
|
||||||
|
|
||||||
|
RUN useradd --create-home --shell /bin/bash appuser
|
||||||
|
|
||||||
|
COPY app/ app/
|
||||||
|
|
||||||
|
COPY alembic.ini .
|
||||||
|
COPY alembic/ alembic/
|
||||||
|
RUN chown -R appuser:appuser /app/alembic
|
||||||
|
|
||||||
|
USER appuser
|
||||||
|
|
||||||
|
EXPOSE 8080
|
||||||
|
|
||||||
|
HEALTHCHECK --interval=10s --timeout=3s --start-period=5s --retries=3 \
|
||||||
|
CMD python -c "import urllib.request; urllib.request.urlopen('http://localhost:8080/health/live')" || exit 1
|
||||||
|
|
||||||
|
CMD ["uvicorn", "app.main:app", "--host", "0.0.0.0", "--port", "8080", "--timeout-graceful-shutdown", "10", "--reload"]
|
||||||
|
|
||||||
@@ -4,7 +4,7 @@ CA_FILE ?=
|
|||||||
ACTION_SCRIPT ?=
|
ACTION_SCRIPT ?=
|
||||||
TLS_ARGS = $(if $(CA_FILE),--ca-file "$(CA_FILE)",)
|
TLS_ARGS = $(if $(CA_FILE),--ca-file "$(CA_FILE)",)
|
||||||
|
|
||||||
.PHONY: help check validate test load test-persistence test-failover
|
.PHONY: help check validate test load test-persistence
|
||||||
|
|
||||||
help:
|
help:
|
||||||
@echo "check: offline structure; validate: full OpenAPI (requirements-dev.txt); test: running API; load: synthetic writes"
|
@echo "check: offline structure; validate: full OpenAPI (requirements-dev.txt); test: running API; load: synthetic writes"
|
||||||
@@ -25,6 +25,76 @@ test-persistence:
|
|||||||
@test -n "$(ACTION_SCRIPT)" || (echo "Set ACTION_SCRIPT to your implemented executable restart hook"; exit 2)
|
@test -n "$(ACTION_SCRIPT)" || (echo "Set ACTION_SCRIPT to your implemented executable restart hook"; exit 2)
|
||||||
$(PYTHON) tests/resilience.py --mode persistence --action-script "$(ACTION_SCRIPT)" --base-url "$(BASE_URL)" $(TLS_ARGS)
|
$(PYTHON) tests/resilience.py --mode persistence --action-script "$(ACTION_SCRIPT)" --base-url "$(BASE_URL)" $(TLS_ARGS)
|
||||||
|
|
||||||
test-failover:
|
explain-10k:
|
||||||
@test -n "$(ACTION_SCRIPT)" || (echo "Set ACTION_SCRIPT to your implemented executable stop-one hook"; exit 2)
|
docker exec -it mtusi_messenger_db psql -U messenger -d messenger_db -c "EXPLAIN (ANALYZE, BUFFERS) SELECT * FROM messages WHERE chat_id = '22222222-2222-2222-2222-222222222222' ORDER BY created_at, id LIMIT 50 OFFSET 0;"
|
||||||
$(PYTHON) tests/resilience.py --mode failover --action-script "$(ACTION_SCRIPT)" --base-url "$(BASE_URL)" $(TLS_ARGS)
|
|
||||||
|
explain-composite:
|
||||||
|
docker exec -it mtusi_messenger_db psql -U messenger -d messenger_db -c "EXPLAIN (ANALYZE, BUFFERS) SELECT * FROM messages WHERE chat_id = '66666666-6666-4666-8666-666666666666' ORDER BY created_at, id LIMIT 50 OFFSET 0;" | tee evidence/explain_composite.txt
|
||||||
|
|
||||||
|
explain-simple:
|
||||||
|
docker exec -it mtusi_messenger_db psql -U messenger -d messenger_db -c "DROP INDEX IF EXISTS ix_messages_chat_created_id;"
|
||||||
|
docker exec -it mtusi_messenger_db psql -U messenger -d messenger_db -c "CREATE INDEX ix_messages_chat_only ON messages (chat_id); ANALYZE messages;"
|
||||||
|
docker exec -it mtusi_messenger_db psql -U messenger -d messenger_db -c "EXPLAIN (ANALYZE, BUFFERS) SELECT * FROM messages WHERE chat_id = '66666666-6666-4666-8666-666666666666' ORDER BY created_at, id LIMIT 50 OFFSET 0;" | tee evidence/explain_simple.txt
|
||||||
|
docker exec -it mtusi_messenger_db psql -U messenger -d messenger_db -c "DROP INDEX ix_messages_chat_only;"
|
||||||
|
docker exec -it mtusi_messenger_db psql -U messenger -d messenger_db -c "CREATE INDEX ix_messages_chat_created_id ON messages (chat_id, created_at, id);"
|
||||||
|
|
||||||
|
backup-restore:
|
||||||
|
@echo "Делаем бекап pg_dump"
|
||||||
|
time docker exec -it mtusi_messenger_db pg_dump -U messenger -d messenger_db > evidence/backup.sql
|
||||||
|
@echo "Создаем новую базу messenger_restore"
|
||||||
|
docker exec -it mtusi_messenger_db psql -U messenger -d postgres -c "DROP DATABASE IF EXISTS messenger_restore;"
|
||||||
|
docker exec -it mtusi_messenger_db psql -U messenger -d postgres -c "CREATE DATABASE messenger_restore;"
|
||||||
|
@echo "Копируем бекап в контейнер и восстанавливаем"
|
||||||
|
docker cp evidence/backup.sql mtusi_messenger_db:/tmp/
|
||||||
|
time docker exec -it mtusi_messenger_db psql -U messenger -d messenger_restore -f /tmp/backup.sql > /dev/null
|
||||||
|
@echo "В основной базе messenger_db:"
|
||||||
|
docker exec -it mtusi_messenger_db psql -U messenger -d messenger_db -t -c "SELECT count(*) FROM messages;"
|
||||||
|
@echo "В восстановленной базе messenger_restore:"
|
||||||
|
docker exec -it mtusi_messenger_db psql -U messenger -d messenger_restore -t -c "SELECT count(*) FROM messages;"
|
||||||
|
|
||||||
|
test-race:
|
||||||
|
@echo "Запускаем два одновременных запроса на регистрацию"
|
||||||
|
@RACE_USER="race_$$(date +%s)"; \
|
||||||
|
curl -s -o /dev/null -w "Запрос 1: %{http_code}\n" -X POST http://localhost:8080/api/v1/users -H "Content-Type: application/json" -d "{\"username\": \"$$RACE_USER\", \"display_name\": \"Race\", \"password\": \"secret1234567\"}" & \
|
||||||
|
curl -s -o /dev/null -w "Запрос 2: %{http_code}\n" -X POST http://localhost:8080/api/v1/users -H "Content-Type: application/json" -d "{\"username\": \"$$RACE_USER\", \"display_name\": \"Race\", \"password\": \"secret1234567\"}" & \
|
||||||
|
wait
|
||||||
|
|
||||||
|
test-redis:
|
||||||
|
@echo "Ставим Redis на паузу"
|
||||||
|
docker pause mtusi_messenger_redis
|
||||||
|
@echo "Запрос"
|
||||||
|
time curl -s -w "\nHTTP Статус: %{http_code}\n" http://localhost:8080/api/v1/users/me -H "Authorization: Bearer test_token"
|
||||||
|
@echo "Снимаем паузу"
|
||||||
|
docker unpause mtusi_messenger_redis
|
||||||
|
|
||||||
|
test-health-db:
|
||||||
|
@echo "Останавливаем БД"
|
||||||
|
docker compose stop db
|
||||||
|
@echo "Проверяем health ready"
|
||||||
|
curl -s -o /dev/null -w "HTTP Статус: %{http_code}\n" http://localhost:8080/health/ready
|
||||||
|
docker compose start db
|
||||||
|
|
||||||
|
test-health-redis:
|
||||||
|
@echo "Останавливаем"
|
||||||
|
docker compose stop redis
|
||||||
|
@echo "Проверяем health ожидая 503 "
|
||||||
|
curl -s -o /dev/null -w "HTTP Статус: %{http_code}\n" http://localhost:8080/health/ready
|
||||||
|
docker compose start redis
|
||||||
|
|
||||||
|
test-dependencies:
|
||||||
|
$(PYTHON) -m pytest tests/test_resilience.py -v
|
||||||
|
|
||||||
|
failover:
|
||||||
|
./scripts/failover-test.sh app1
|
||||||
|
|
||||||
|
failover-app2:
|
||||||
|
./scripts/failover-test.sh app2
|
||||||
|
|
||||||
|
rolling-load:
|
||||||
|
./scripts/rolling-load.sh
|
||||||
|
|
||||||
|
rolling-update:
|
||||||
|
./scripts/rolling-update.sh
|
||||||
|
|
||||||
|
test-lab3:
|
||||||
|
$(PYTHON) -m pytest tests/test_lab3.py -v
|
||||||
@@ -1,37 +1,99 @@
|
|||||||
# Отчёт — лабораторная 3
|
# Отчёт — лабораторная 3
|
||||||
|
|
||||||
- Автор, группа: TODO
|
- Автор, группа: Долда Кирилл, БПИ2301
|
||||||
- Целевая оценка; выбранный трек 5, если нужен: TODO
|
- Целевая оценка; на 5, Трек 1 (Цена масштабирования)
|
||||||
- Commit/PR: TODO после публикации
|
- Commit/PR: TODO после публикации
|
||||||
- Использованные источники, библиотеки и помощь ИИ: TODO
|
- Использованные источники, библиотеки и помощь ИИ: FastAPI, SQLAlchemy, asyncpg, Alembic, passlib[bcrypt], redis, psycopg2-binary.
|
||||||
|
|
||||||
## Запуск из чистого clone
|
## Запуск из чистого clone
|
||||||
|
|
||||||
TODO: версии runtime/образов, prerequisites, команды создания локальных secrets/.env, build, миграций, запуска, ожидания готовности, тестов и остановки. Указать необходимые действия оператора. Не вставлять секреты. Отдельно указать безопасную остановку и команду намеренного удаления учебных данных.
|
Требования: Docker Desktop, Python 3.13 для локальных тестов.
|
||||||
|
|
||||||
|
Версии runtime/образов:
|
||||||
|
python:3.13-slim
|
||||||
|
postgres:16-alpine
|
||||||
|
redis:7-alpine
|
||||||
|
nginx:alpine
|
||||||
|
|
||||||
|
Python-пакеты: fastapi==0.115.0, uvicorn[standard]==0.52.4, pydantic==2.13.5, sqlalchemy[asyncio]==2.1.0, asyncpg==0.31.0, redis==6.2.0, passlib==1.7.4, bcrypt==4.1.2, alembic==1.14.0, psycopg2-binary, pytest==8.3.4
|
||||||
|
|
||||||
|
Создание локальных secrets/.env:
|
||||||
|
cp .env.example .env
|
||||||
|
|
||||||
|
Сборка и запуск:
|
||||||
|
docker compose up -d --build
|
||||||
|
|
||||||
|
Миграции (однократно, до запуска трафика):
|
||||||
|
docker compose exec -w /app app1 alembic upgrade head
|
||||||
|
|
||||||
|
Тесты:
|
||||||
|
|
||||||
|
make check - offline-проверка структуры и синтаксиса
|
||||||
|
make test - публичный smoke-тест контракта API
|
||||||
|
make test-lab3 - собственные тесты лабы 3 (идемпотентность + общая сессия)
|
||||||
|
make test-dependencies - тесты отказов зависимостей (БД -> 503, Redis -> 500)
|
||||||
|
make failover - остановка app1 -> проверка, что сервис жив (app2)
|
||||||
|
make failover-app2 - остановка app2 -> проверка, что сервис жив (app1)
|
||||||
|
make rolling-load - нагрузка во время rolling update (в одном терминале)
|
||||||
|
make rolling-update - поочерёдное обновление реплик (в другом терминале)
|
||||||
|
make load - нагрузочный тест для Трека 1 (RPS, p50/p95/p99)
|
||||||
|
docker stats - Проверка загруженности CPU/RAM при активном make load
|
||||||
|
|
||||||
## Архитектура и решения
|
## Архитектура и решения
|
||||||
|
|
||||||
TODO: схема процессов/хранилищ, источник истины, транзакционные границы, ограничения. Что перенесено из lab2, что изменено в этой работе. Соответствие переменных из .env.example реальной конфигурации.
|
Схема процессов/хранилищ:
|
||||||
|
Клиент -> Nginx (LB) -> API * 2 (app1, app2) -> PostgreSQL (источник истины) + Redis (сессии).
|
||||||
|
|
||||||
|
Источник истины: PostgreSQL. Пользователи, чаты, участники, сообщения.
|
||||||
|
|
||||||
|
Сессии: Redis. Токен secrets.token_urlsafe(32) с TTL. Персистентность Redis через --appendonly yes.
|
||||||
|
|
||||||
|
Транзакционные границы: Создание сообщения с Idempotency-Key: SET NX в Redis, застолбить ключ -> commit в БД, создать сообщение в postgre -> SET результата в Redis сохраняем.
|
||||||
|
|
||||||
|
Что перенесено из lab2: PostgreSQL, Redis для сессий, миграции, Bearer-токены.
|
||||||
|
|
||||||
|
Что изменено: Добавлены реплики app1/app2, Nginx (LB), X-Instance-Id, Idempotency-Key, лимиты CPU/RAM, failover-тесты, rolling update, least_conn в Nginx.
|
||||||
|
|
||||||
## Доказательства критериев
|
## Доказательства критериев
|
||||||
|
|
||||||
| Критерий README | Команда/сценарий | Наблюдаемый результат | Файл доказательства |
|
| Критерий README | Команда/сценарий | Наблюдаемый результат | Файл доказательства |
|
||||||
| --- | --- | --- | --- |
|
|----------------------------|------------------------|---------------------------------------------------------------------------------------------------------|--------------------------------|
|
||||||
| Публичный smoke | make test | TODO | TODO |
|
| Публичный smoke | make test | PASS: lab3 public API scenario | |
|
||||||
| Остальные пункты уровня 3 | TODO | TODO | TODO |
|
| Собственные тесты | make test-lab3 | PASS (3/3): идемпотентность (тот же id), идемпотентность (409), общая сессия (≥2 разных x-instance-id) | evidence/test-lab3.txt |
|
||||||
| Все пункты уровня 4, если заявлен | TODO | TODO | TODO |
|
| Тесты отказов зависимостей | make test-dependencies | PASS (2/2): БД -> 503, Redis -> 500 с Error | evidence/test-dependencies.txt |
|
||||||
| Выбранный трек 5, если заявлен | TODO | TODO | TODO |
|
| Failover app1 | make failover | Все 20 запросов 200, ни одного 502 | evidence/failover-app1.txt |
|
||||||
|
| Failover app2 | make failover-app2 | Все 20 запросов 200, ни одного 502 | evidence/failover-app2.txt |
|
||||||
TODO: добавить отдельную строку для каждого заявленного критерия. PASS без команды и наблюдения не является доказательством. Проверка инфраструктурного hook требует подтверждения, какие реальные процессы/хранилища перезапущены.
|
| Rolling load | make rolling-load | Все 200, X-Instance-Id меняется | evidence/rolling-load.txt |
|
||||||
|
| Rolling update | make rolling-update | Без простоя | evidence/rolling-update.txt |
|
||||||
|
|
||||||
## Эксперименты и отказы
|
## Эксперименты и отказы
|
||||||
|
|
||||||
TODO: гипотеза, hardware/лимиты, версии, объём данных, профиль нагрузки, concurrency/arrival rate, длительность/прогрев, повторы, успешные RPS, ошибки, p50/p95/p99, CPU/RAM. Сохранить raw summary без tokens и объяснить ограничения измерения.
|
Гипотеза (Трек 1):
|
||||||
|
|
||||||
| Воздействие | Что ожидаем | Что наблюдали | Время восстановления / потеря данных |
|
При фиксированных суммарных ресурсах (2 CPU / 1 GB) рост числа реплик API даст прирост RPS, но упрётся в saturation point.
|
||||||
| --- | --- | --- | --- |
|
|
||||||
| TODO | TODO | TODO | TODO |
|
Методика: make load (POST /messages, 30 сек, 4 пользователя).
|
||||||
|
|
||||||
|
Конфигурации: 1, 2, 4, 6 реплик при суммарных 2 CPU / 1 GB. Замеряли RPS и p99.
|
||||||
|
|
||||||
|
Так же проводили замеры с 1 CPU / 512M. Результаты всех замеров зафиксированы в папке evidence.
|
||||||
|
|
||||||
|
| Реплик | RPS (среднее) | p99 (мс) |
|
||||||
|
| 1 | ~250 | 23 |
|
||||||
|
| 2 | ~255 | 31 |
|
||||||
|
| 4 | ~260 | 26 |
|
||||||
|
| 6 | 257 | - |
|
||||||
|
|
||||||
|
Корректные данные по результатам, график: evidence/scaling.png
|
||||||
|
|
||||||
## Ограничения и следующие шаги
|
## Ограничения и следующие шаги
|
||||||
|
|
||||||
TODO: какие отказы выдерживаются и какие нет; что не реализовано; где учебное упрощение; какое улучшение подтверждено, а какое пока гипотеза.
|
Что выдерживается: Отказ процесса (реплики), rolling update, общая сессия, идемпотентность, миграции однократно.
|
||||||
|
|
||||||
|
Подтверждённое улучшение: p99 снижен с 48.7 до 12.9 мс (CPU 0.5 → 1.0) — улучшение задержки. RPS не вырос — saturation point в общем ресурсе.
|
||||||
|
|
||||||
|
При фиксированных суммарных ресурсах 2 CPU и 1 GB и распределении их на 1, 2 и 4 реплики RPS составил 250, 255 и 260, что указывает на достижение saturation point именно на 4 репликах.
|
||||||
|
При изначально меньших ресурсах - 0.5 CPU и 512 MB на реплику, сатурация наступала уже на 1 реплике, так как увеличение числа реплик не раскрывало потенциал из-за максимальной нагрузки на каждую из них.
|
||||||
|
В качестве подтверждённого улучшения в этом сценарии доказано, что увеличение CPU на реплику с 0.5 до 1.0 подняло RPS с 234 до 254 и снизило p99 с 24 до 17 мс по результатам make load (4 пользователя отправляют в течении 30 секунд запросы на создание сообщений).
|
||||||
|
Для полноценного эксперимента за пределами условий задания на 1, 2, 4 реплики был проведён замер на 6 репликах, который показал 257 RPS, подтвердив saturation point на 4 репликах и последующее снижение.
|
||||||
|
Также доказано, что увеличение CPU с 1 до 2 на реплику, при втором тесте, даёт прирост скорости ответа p99 на 7–10% при распределении реплик, но не увеличивает RPS.
|
||||||
+117
@@ -0,0 +1,117 @@
|
|||||||
|
# A generic, single database configuration.
|
||||||
|
|
||||||
|
[alembic]
|
||||||
|
# path to migration scripts
|
||||||
|
# Use forward slashes (/) also on windows to provide an os agnostic path
|
||||||
|
script_location = alembic
|
||||||
|
|
||||||
|
# template used to generate migration file names; The default value is %%(rev)s_%%(slug)s
|
||||||
|
# Uncomment the line below if you want the files to be prepended with date and time
|
||||||
|
# see https://alembic.sqlalchemy.org/en/latest/tutorial.html#editing-the-ini-file
|
||||||
|
# for all available tokens
|
||||||
|
# file_template = %%(year)d_%%(month).2d_%%(day).2d_%%(hour).2d%%(minute).2d-%%(rev)s_%%(slug)s
|
||||||
|
|
||||||
|
# sys.path path, will be prepended to sys.path if present.
|
||||||
|
# defaults to the current working directory.
|
||||||
|
prepend_sys_path = .
|
||||||
|
|
||||||
|
# timezone to use when rendering the date within the migration file
|
||||||
|
# as well as the filename.
|
||||||
|
# If specified, requires the python>=3.9 or backports.zoneinfo library.
|
||||||
|
# Any required deps can installed by adding `alembic[tz]` to the pip requirements
|
||||||
|
# string value is passed to ZoneInfo()
|
||||||
|
# leave blank for localtime
|
||||||
|
# timezone =
|
||||||
|
|
||||||
|
# max length of characters to apply to the "slug" field
|
||||||
|
# truncate_slug_length = 40
|
||||||
|
|
||||||
|
# set to 'true' to run the environment during
|
||||||
|
# the 'revision' command, regardless of autogenerate
|
||||||
|
# revision_environment = false
|
||||||
|
|
||||||
|
# set to 'true' to allow .pyc and .pyo files without
|
||||||
|
# a source .py file to be detected as revisions in the
|
||||||
|
# versions/ directory
|
||||||
|
# sourceless = false
|
||||||
|
|
||||||
|
# version location specification; This defaults
|
||||||
|
# to alembic/versions. When using multiple version
|
||||||
|
# directories, initial revisions must be specified with --version-path.
|
||||||
|
# The path separator used here should be the separator specified by "version_path_separator" below.
|
||||||
|
# version_locations = %(here)s/bar:%(here)s/bat:alembic/versions
|
||||||
|
|
||||||
|
# version path separator; As mentioned above, this is the character used to split
|
||||||
|
# version_locations. The default within new alembic.ini files is "os", which uses os.pathsep.
|
||||||
|
# If this key is omitted entirely, it falls back to the legacy behavior of splitting on spaces and/or commas.
|
||||||
|
# Valid values for version_path_separator are:
|
||||||
|
#
|
||||||
|
# version_path_separator = :
|
||||||
|
# version_path_separator = ;
|
||||||
|
# version_path_separator = space
|
||||||
|
# version_path_separator = newline
|
||||||
|
version_path_separator = os # Use os.pathsep. Default configuration used for new projects.
|
||||||
|
|
||||||
|
# set to 'true' to search source files recursively
|
||||||
|
# in each "version_locations" directory
|
||||||
|
# new in Alembic version 1.10
|
||||||
|
# recursive_version_locations = false
|
||||||
|
|
||||||
|
# the output encoding used when revision files
|
||||||
|
# are written from script.py.mako
|
||||||
|
# output_encoding = utf-8
|
||||||
|
|
||||||
|
sqlalchemy.url = driver://user:pass@localhost/dbname
|
||||||
|
|
||||||
|
|
||||||
|
[post_write_hooks]
|
||||||
|
# post_write_hooks defines scripts or Python functions that are run
|
||||||
|
# on newly generated revision scripts. See the documentation for further
|
||||||
|
# detail and examples
|
||||||
|
|
||||||
|
# format using "black" - use the console_scripts runner, against the "black" entrypoint
|
||||||
|
# hooks = black
|
||||||
|
# black.type = console_scripts
|
||||||
|
# black.entrypoint = black
|
||||||
|
# black.options = -l 79 REVISION_SCRIPT_FILENAME
|
||||||
|
|
||||||
|
# lint with attempts to fix using "ruff" - use the exec runner, execute a binary
|
||||||
|
# hooks = ruff
|
||||||
|
# ruff.type = exec
|
||||||
|
# ruff.executable = %(here)s/.venv/bin/ruff
|
||||||
|
# ruff.options = --fix REVISION_SCRIPT_FILENAME
|
||||||
|
|
||||||
|
# Logging configuration
|
||||||
|
[loggers]
|
||||||
|
keys = root,sqlalchemy,alembic
|
||||||
|
|
||||||
|
[handlers]
|
||||||
|
keys = console
|
||||||
|
|
||||||
|
[formatters]
|
||||||
|
keys = generic
|
||||||
|
|
||||||
|
[logger_root]
|
||||||
|
level = WARNING
|
||||||
|
handlers = console
|
||||||
|
qualname =
|
||||||
|
|
||||||
|
[logger_sqlalchemy]
|
||||||
|
level = WARNING
|
||||||
|
handlers =
|
||||||
|
qualname = sqlalchemy.engine
|
||||||
|
|
||||||
|
[logger_alembic]
|
||||||
|
level = INFO
|
||||||
|
handlers =
|
||||||
|
qualname = alembic
|
||||||
|
|
||||||
|
[handler_console]
|
||||||
|
class = StreamHandler
|
||||||
|
args = (sys.stderr,)
|
||||||
|
level = NOTSET
|
||||||
|
formatter = generic
|
||||||
|
|
||||||
|
[formatter_generic]
|
||||||
|
format = %(levelname)-5.5s [%(name)s] %(message)s
|
||||||
|
datefmt = %H:%M:%S
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
Generic single-database configuration.
|
||||||
@@ -0,0 +1,88 @@
|
|||||||
|
from app.models.base import Base
|
||||||
|
from app.models.user import User
|
||||||
|
|
||||||
|
from app.models.chat import Chat, ChatMember
|
||||||
|
from app.models.message import Message
|
||||||
|
from app.config import DATABASE_URL
|
||||||
|
|
||||||
|
from logging.config import fileConfig
|
||||||
|
|
||||||
|
from sqlalchemy import engine_from_config
|
||||||
|
from sqlalchemy import pool
|
||||||
|
|
||||||
|
from alembic import context
|
||||||
|
|
||||||
|
|
||||||
|
# this is the Alembic Config object, which provides
|
||||||
|
# access to the values within the .ini file in use.
|
||||||
|
config = context.config
|
||||||
|
config.set_main_option("sqlalchemy.url", DATABASE_URL.replace("+asyncpg", "+psycopg2"))
|
||||||
|
|
||||||
|
|
||||||
|
# Interpret the config file for Python logging.
|
||||||
|
# This line sets up loggers basically.
|
||||||
|
if config.config_file_name is not None:
|
||||||
|
fileConfig(config.config_file_name)
|
||||||
|
|
||||||
|
# add your model's MetaData object here
|
||||||
|
# for 'autogenerate' support
|
||||||
|
# from myapp import mymodel
|
||||||
|
# target_metadata = mymodel.Base.metadata
|
||||||
|
target_metadata = Base.metadata
|
||||||
|
|
||||||
|
# other values from the config, defined by the needs of env.py,
|
||||||
|
# can be acquired:
|
||||||
|
# my_important_option = config.get_main_option("my_important_option")
|
||||||
|
# ... etc.
|
||||||
|
|
||||||
|
|
||||||
|
def run_migrations_offline() -> None:
|
||||||
|
"""Run migrations in 'offline' mode.
|
||||||
|
|
||||||
|
This configures the context with just a URL
|
||||||
|
and not an Engine, though an Engine is acceptable
|
||||||
|
here as well. By skipping the Engine creation
|
||||||
|
we don't even need a DBAPI to be available.
|
||||||
|
|
||||||
|
Calls to context.execute() here emit the given string to the
|
||||||
|
script output.
|
||||||
|
|
||||||
|
"""
|
||||||
|
url = config.get_main_option("sqlalchemy.url")
|
||||||
|
context.configure(
|
||||||
|
url=url,
|
||||||
|
target_metadata=target_metadata,
|
||||||
|
literal_binds=True,
|
||||||
|
dialect_opts={"paramstyle": "named"},
|
||||||
|
)
|
||||||
|
|
||||||
|
with context.begin_transaction():
|
||||||
|
context.run_migrations()
|
||||||
|
|
||||||
|
|
||||||
|
def run_migrations_online() -> None:
|
||||||
|
"""Run migrations in 'online' mode.
|
||||||
|
|
||||||
|
In this scenario we need to create an Engine
|
||||||
|
and associate a connection with the context.
|
||||||
|
|
||||||
|
"""
|
||||||
|
connectable = engine_from_config(
|
||||||
|
config.get_section(config.config_ini_section, {}),
|
||||||
|
prefix="sqlalchemy.",
|
||||||
|
poolclass=pool.NullPool,
|
||||||
|
)
|
||||||
|
|
||||||
|
with connectable.connect() as connection:
|
||||||
|
context.configure(
|
||||||
|
connection=connection, target_metadata=target_metadata
|
||||||
|
)
|
||||||
|
|
||||||
|
with context.begin_transaction():
|
||||||
|
context.run_migrations()
|
||||||
|
|
||||||
|
|
||||||
|
if context.is_offline_mode():
|
||||||
|
run_migrations_offline()
|
||||||
|
else:
|
||||||
|
run_migrations_online()
|
||||||
@@ -0,0 +1,26 @@
|
|||||||
|
"""${message}
|
||||||
|
|
||||||
|
Revision ID: ${up_revision}
|
||||||
|
Revises: ${down_revision | comma,n}
|
||||||
|
Create Date: ${create_date}
|
||||||
|
|
||||||
|
"""
|
||||||
|
from typing import Sequence, Union
|
||||||
|
|
||||||
|
from alembic import op
|
||||||
|
import sqlalchemy as sa
|
||||||
|
${imports if imports else ""}
|
||||||
|
|
||||||
|
# revision identifiers, used by Alembic.
|
||||||
|
revision: str = ${repr(up_revision)}
|
||||||
|
down_revision: Union[str, None] = ${repr(down_revision)}
|
||||||
|
branch_labels: Union[str, Sequence[str], None] = ${repr(branch_labels)}
|
||||||
|
depends_on: Union[str, Sequence[str], None] = ${repr(depends_on)}
|
||||||
|
|
||||||
|
|
||||||
|
def upgrade() -> None:
|
||||||
|
${upgrades if upgrades else "pass"}
|
||||||
|
|
||||||
|
|
||||||
|
def downgrade() -> None:
|
||||||
|
${downgrades if downgrades else "pass"}
|
||||||
@@ -0,0 +1,30 @@
|
|||||||
|
"""create tables
|
||||||
|
|
||||||
|
Revision ID: 08fe661df060
|
||||||
|
Revises: bc35c1b6b748
|
||||||
|
Create Date: 2026-10-31 11:52:26.342048
|
||||||
|
|
||||||
|
"""
|
||||||
|
from typing import Sequence, Union
|
||||||
|
|
||||||
|
from alembic import op
|
||||||
|
import sqlalchemy as sa
|
||||||
|
|
||||||
|
|
||||||
|
# revision identifiers, used by Alembic.
|
||||||
|
revision: str = '08fe661df060'
|
||||||
|
down_revision: Union[str, None] = 'bc35c1b6b748'
|
||||||
|
branch_labels: Union[str, Sequence[str], None] = None
|
||||||
|
depends_on: Union[str, Sequence[str], None] = None
|
||||||
|
|
||||||
|
|
||||||
|
def upgrade() -> None:
|
||||||
|
# ### commands auto generated by Alembic - please adjust! ###
|
||||||
|
pass
|
||||||
|
# ### end Alembic commands ###
|
||||||
|
|
||||||
|
|
||||||
|
def downgrade() -> None:
|
||||||
|
# ### commands auto generated by Alembic - please adjust! ###
|
||||||
|
pass
|
||||||
|
# ### end Alembic commands ###
|
||||||
@@ -0,0 +1,67 @@
|
|||||||
|
"""create tables
|
||||||
|
|
||||||
|
Revision ID: b24373e3b620
|
||||||
|
Revises:
|
||||||
|
Create Date: 2026-10-24 06:54:22.471827
|
||||||
|
|
||||||
|
"""
|
||||||
|
from typing import Sequence, Union
|
||||||
|
|
||||||
|
from alembic import op
|
||||||
|
import sqlalchemy as sa
|
||||||
|
|
||||||
|
|
||||||
|
# revision identifiers, used by Alembic.
|
||||||
|
revision: str = 'b24373e3b620'
|
||||||
|
down_revision: Union[str, None] = None
|
||||||
|
branch_labels: Union[str, Sequence[str], None] = None
|
||||||
|
depends_on: Union[str, Sequence[str], None] = None
|
||||||
|
|
||||||
|
|
||||||
|
def upgrade() -> None:
|
||||||
|
# ### commands auto generated by Alembic - please adjust! ###
|
||||||
|
op.create_table('chats',
|
||||||
|
sa.Column('id', sa.UUID(), nullable=False),
|
||||||
|
sa.Column('title', sa.String(length=100), nullable=False),
|
||||||
|
sa.Column('created_at', sa.DateTime(timezone=True), server_default=sa.text('now()'), nullable=False),
|
||||||
|
sa.PrimaryKeyConstraint('id')
|
||||||
|
)
|
||||||
|
op.create_table('users',
|
||||||
|
sa.Column('id', sa.UUID(), nullable=False),
|
||||||
|
sa.Column('username', sa.String(length=32), nullable=False),
|
||||||
|
sa.Column('display_name', sa.String(length=100), nullable=False),
|
||||||
|
sa.Column('password_hash', sa.String(length=255), nullable=False),
|
||||||
|
sa.Column('created_at', sa.DateTime(timezone=True), server_default=sa.text('now()'), nullable=False),
|
||||||
|
sa.PrimaryKeyConstraint('id')
|
||||||
|
)
|
||||||
|
op.create_index(op.f('ix_users_username'), 'users', ['username'], unique=True)
|
||||||
|
op.create_table('chat_members',
|
||||||
|
sa.Column('chat_id', sa.UUID(), nullable=False),
|
||||||
|
sa.Column('user_id', sa.UUID(), nullable=False),
|
||||||
|
sa.ForeignKeyConstraint(['chat_id'], ['chats.id'], ondelete='CASCADE'),
|
||||||
|
sa.ForeignKeyConstraint(['user_id'], ['users.id'], ondelete='CASCADE'),
|
||||||
|
sa.PrimaryKeyConstraint('chat_id', 'user_id')
|
||||||
|
)
|
||||||
|
op.create_table('messages',
|
||||||
|
sa.Column('id', sa.UUID(), nullable=False),
|
||||||
|
sa.Column('chat_id', sa.UUID(), nullable=False),
|
||||||
|
sa.Column('sender_id', sa.UUID(), nullable=False),
|
||||||
|
sa.Column('text', sa.Text(), nullable=False),
|
||||||
|
sa.Column('created_at', sa.DateTime(timezone=True), server_default=sa.text('now()'), nullable=False),
|
||||||
|
sa.ForeignKeyConstraint(['chat_id'], ['chats.id'], ondelete='CASCADE'),
|
||||||
|
sa.ForeignKeyConstraint(['sender_id'], ['users.id'], ondelete='CASCADE'),
|
||||||
|
sa.PrimaryKeyConstraint('id')
|
||||||
|
)
|
||||||
|
op.create_index('ix_messages_chat_created_id', 'messages', ['chat_id', 'created_at', 'id'], unique=False)
|
||||||
|
# ### end Alembic commands ###
|
||||||
|
|
||||||
|
|
||||||
|
def downgrade() -> None:
|
||||||
|
# ### commands auto generated by Alembic - please adjust! ###
|
||||||
|
op.drop_index('ix_messages_chat_created_id', table_name='messages')
|
||||||
|
op.drop_table('messages')
|
||||||
|
op.drop_table('chat_members')
|
||||||
|
op.drop_index(op.f('ix_users_username'), table_name='users')
|
||||||
|
op.drop_table('users')
|
||||||
|
op.drop_table('chats')
|
||||||
|
# ### end Alembic commands ###
|
||||||
@@ -0,0 +1,43 @@
|
|||||||
|
"""seed explain test 10k
|
||||||
|
|
||||||
|
Revision ID: bc35c1b6b748
|
||||||
|
Revises: f9b85be2b710
|
||||||
|
Create Date: 2026-10-24 07:04:09.294404
|
||||||
|
|
||||||
|
"""
|
||||||
|
from typing import Sequence, Union
|
||||||
|
|
||||||
|
from alembic import op
|
||||||
|
import sqlalchemy as sa
|
||||||
|
|
||||||
|
|
||||||
|
# revision identifiers, used by Alembic.
|
||||||
|
revision: str = 'bc35c1b6b748'
|
||||||
|
down_revision: Union[str, None] = 'f9b85be2b710'
|
||||||
|
branch_labels: Union[str, Sequence[str], None] = None
|
||||||
|
depends_on: Union[str, Sequence[str], None] = None
|
||||||
|
|
||||||
|
|
||||||
|
def upgrade() -> None:
|
||||||
|
op.execute("""
|
||||||
|
INSERT INTO users (id, username, display_name, password_hash, created_at)
|
||||||
|
VALUES ('11111111-1111-1111-1111-111111111111', 'explain_test', 'Test', 'hash', NOW())
|
||||||
|
ON CONFLICT DO NOTHING;
|
||||||
|
""")
|
||||||
|
|
||||||
|
op.execute("""
|
||||||
|
INSERT INTO chats (id, title, created_at)
|
||||||
|
VALUES ('22222222-2222-2222-2222-222222222222', 'Explain Chat', NOW())
|
||||||
|
ON CONFLICT DO NOTHING;
|
||||||
|
""")
|
||||||
|
|
||||||
|
op.execute("""
|
||||||
|
INSERT INTO messages (id, chat_id, sender_id, text, created_at)
|
||||||
|
SELECT gen_random_uuid(), '22222222-2222-2222-2222-222222222222', '11111111-1111-1111-1111-111111111111', 'Message ' || i, NOW() - (i || ' minutes')::interval
|
||||||
|
FROM generate_series(1, 10000) AS i;
|
||||||
|
""")
|
||||||
|
|
||||||
|
def downgrade() -> None:
|
||||||
|
op.execute("DELETE FROM messages WHERE chat_id = '22222222-2222-2222-2222-222222222222';")
|
||||||
|
op.execute("DELETE FROM chats WHERE id = '22222222-2222-2222-2222-222222222222';")
|
||||||
|
op.execute("DELETE FROM users WHERE id = '11111111-1111-1111-1111-111111111111';")
|
||||||
@@ -0,0 +1,69 @@
|
|||||||
|
"""seed load test data
|
||||||
|
|
||||||
|
Revision ID: f9b85be2b710
|
||||||
|
Revises: b24373e3b620
|
||||||
|
Create Date: ...
|
||||||
|
"""
|
||||||
|
from typing import Sequence, Union
|
||||||
|
|
||||||
|
from alembic import op
|
||||||
|
import sqlalchemy as sa
|
||||||
|
|
||||||
|
|
||||||
|
# revision identifiers, used by Alembic.
|
||||||
|
revision: str = 'f9b85be2b710'
|
||||||
|
down_revision: Union[str, None] = 'b24373e3b620'
|
||||||
|
branch_labels: Union[str, Sequence[str], None] = None
|
||||||
|
depends_on: Union[str, Sequence[str], None] = None
|
||||||
|
|
||||||
|
|
||||||
|
def upgrade() -> None:
|
||||||
|
op.execute("""
|
||||||
|
INSERT INTO users (id, username, display_name, password_hash, created_at)
|
||||||
|
VALUES ('55555555-5555-4555-8555-555555555555', 'load_test', 'Load', 'hash', NOW())
|
||||||
|
ON CONFLICT DO NOTHING;
|
||||||
|
""")
|
||||||
|
|
||||||
|
op.execute("""
|
||||||
|
INSERT INTO chats (id, title, created_at) VALUES
|
||||||
|
('66666666-6666-4666-8666-666666666666', 'Big Chat', NOW()),
|
||||||
|
('77777777-7777-4777-8777-777777777777', 'Small Chat 1', NOW()),
|
||||||
|
('88888888-8888-4888-8888-888888888888', 'Small Chat 2', NOW())
|
||||||
|
ON CONFLICT DO NOTHING;
|
||||||
|
""")
|
||||||
|
|
||||||
|
op.execute("""
|
||||||
|
INSERT INTO messages (id, chat_id, sender_id, text, created_at)
|
||||||
|
SELECT gen_random_uuid(), '66666666-6666-4666-8666-666666666666', '55555555-5555-4555-8555-555555555555', 'Big ' || i, NOW() - (i || ' minutes')::interval
|
||||||
|
FROM generate_series(1, 80000) AS i;
|
||||||
|
""")
|
||||||
|
|
||||||
|
op.execute("""
|
||||||
|
INSERT INTO messages (id, chat_id, sender_id, text, created_at)
|
||||||
|
SELECT gen_random_uuid(), '77777777-7777-4777-8777-777777777777', '55555555-5555-4555-8555-555555555555', 'Small1 ' || i, NOW() - (i || ' minutes')::interval
|
||||||
|
FROM generate_series(1, 10000) AS i;
|
||||||
|
""")
|
||||||
|
|
||||||
|
op.execute("""
|
||||||
|
INSERT INTO messages (id, chat_id, sender_id, text, created_at)
|
||||||
|
SELECT gen_random_uuid(), '88888888-8888-4888-8888-888888888888', '55555555-5555-4555-8555-555555555555', 'Small2 ' || i, NOW() - (i || ' minutes')::interval
|
||||||
|
FROM generate_series(1, 10000) AS i;
|
||||||
|
""")
|
||||||
|
|
||||||
|
|
||||||
|
def downgrade() -> None:
|
||||||
|
op.execute("""
|
||||||
|
DELETE FROM messages WHERE chat_id IN (
|
||||||
|
'66666666-6666-4666-8666-666666666666',
|
||||||
|
'77777777-7777-4777-8777-777777777777',
|
||||||
|
'88888888-8888-4888-8888-888888888888'
|
||||||
|
);
|
||||||
|
""")
|
||||||
|
op.execute("""
|
||||||
|
DELETE FROM chats WHERE id IN (
|
||||||
|
'66666666-6666-4666-8666-666666666666',
|
||||||
|
'77777777-7777-4777-8777-777777777777',
|
||||||
|
'88888888-8888-4888-8888-888888888888'
|
||||||
|
);
|
||||||
|
""")
|
||||||
|
op.execute("DELETE FROM users WHERE id = '55555555-5555-4555-8555-555555555555';")
|
||||||
@@ -0,0 +1,20 @@
|
|||||||
|
import os
|
||||||
|
|
||||||
|
DATABASE_URL = os.getenv(
|
||||||
|
"DATABASE_URL",
|
||||||
|
"postgresql+asyncpg://messenger:messenger_password@db:5432/messenger_db",
|
||||||
|
)
|
||||||
|
REDIS_URL = os.getenv("REDIS_URL", "redis://redis:6379/0")
|
||||||
|
SESSION_TTL_SECONDS = int(os.getenv("SESSION_TTL_SECONDS", "3600"))
|
||||||
|
|
||||||
|
CODE_MAP = {
|
||||||
|
400: "invalid_request",
|
||||||
|
401: "unauthorized",
|
||||||
|
404: "not_found",
|
||||||
|
409: "conflict",
|
||||||
|
413: "payload_too_large",
|
||||||
|
415: "unsupported_media_type",
|
||||||
|
429: "rate_limited",
|
||||||
|
503: "unavailable",
|
||||||
|
500: "internal_error",
|
||||||
|
}
|
||||||
@@ -0,0 +1,13 @@
|
|||||||
|
from sqlalchemy.ext.asyncio import create_async_engine, async_sessionmaker
|
||||||
|
from app.config import DATABASE_URL
|
||||||
|
|
||||||
|
engine = create_async_engine(
|
||||||
|
DATABASE_URL,
|
||||||
|
pool_size=5,
|
||||||
|
max_overflow=10,
|
||||||
|
pool_timeout=30,
|
||||||
|
pool_recycle=1800,
|
||||||
|
echo=False,
|
||||||
|
)
|
||||||
|
|
||||||
|
async_session_maker = async_sessionmaker(engine, expire_on_commit=False)
|
||||||
@@ -0,0 +1,6 @@
|
|||||||
|
from sqlalchemy.ext.asyncio import AsyncSession
|
||||||
|
from app.database import async_session_maker
|
||||||
|
|
||||||
|
async def get_session():
|
||||||
|
async with async_session_maker() as session:
|
||||||
|
yield session
|
||||||
@@ -0,0 +1,37 @@
|
|||||||
|
from fastapi import HTTPException, Request
|
||||||
|
from fastapi.responses import JSONResponse
|
||||||
|
from fastapi.exceptions import RequestValidationError
|
||||||
|
from app.config import CODE_MAP
|
||||||
|
|
||||||
|
|
||||||
|
def error_response(request: Request, status_code: int, code: str, message: str, extra_headers: dict = None):
|
||||||
|
request_id = getattr(request.state, "request_id", "unknown")
|
||||||
|
|
||||||
|
|
||||||
|
headers = {"X-Request-Id": request_id}
|
||||||
|
if extra_headers:
|
||||||
|
headers.update(extra_headers)
|
||||||
|
|
||||||
|
return JSONResponse(
|
||||||
|
status_code=status_code,
|
||||||
|
content={
|
||||||
|
"error": {
|
||||||
|
"code": code,
|
||||||
|
"message": message,
|
||||||
|
"request_id": request_id,
|
||||||
|
}
|
||||||
|
},
|
||||||
|
headers=headers,
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
async def http_exception_handler(request: Request, exc: HTTPException):
|
||||||
|
code = CODE_MAP.get(exc.status_code, "internal_error")
|
||||||
|
return error_response(request, exc.status_code, code, str(exc.detail), extra_headers=exc.headers)
|
||||||
|
|
||||||
|
|
||||||
|
async def validation_exception_handler(request: Request, exc: RequestValidationError):
|
||||||
|
return error_response(request, 400, "invalid_request", "Ошибка валидации данных")
|
||||||
|
|
||||||
|
async def internal_error_handler(request: Request, exc: Exception):
|
||||||
|
return error_response(request, 500, "internal_error", "Внутренняя ошибка сервера")
|
||||||
+33
@@ -0,0 +1,33 @@
|
|||||||
|
from fastapi import FastAPI
|
||||||
|
from fastapi.exceptions import RequestValidationError
|
||||||
|
from fastapi import HTTPException
|
||||||
|
import uuid
|
||||||
|
from app.middleware import RequestIdMiddleware
|
||||||
|
from app.exceptions import http_exception_handler, validation_exception_handler
|
||||||
|
from app.routers import health, users, chats, messages, auth
|
||||||
|
|
||||||
|
|
||||||
|
app = FastAPI(
|
||||||
|
title="MTUSI Messenger",
|
||||||
|
version="1.1.0",
|
||||||
|
)
|
||||||
|
|
||||||
|
INSTANCE_ID = str(uuid.uuid4())
|
||||||
|
|
||||||
|
@app.middleware("http")
|
||||||
|
async def add_instance_id_header(request, call_next):
|
||||||
|
response = await call_next(request)
|
||||||
|
response.headers["X-Instance-Id"] = INSTANCE_ID
|
||||||
|
return response
|
||||||
|
|
||||||
|
app.add_middleware(RequestIdMiddleware)
|
||||||
|
|
||||||
|
|
||||||
|
app.add_exception_handler(HTTPException, http_exception_handler)
|
||||||
|
app.add_exception_handler(RequestValidationError, validation_exception_handler)
|
||||||
|
|
||||||
|
app.include_router(health.router)
|
||||||
|
app.include_router(users.router)
|
||||||
|
app.include_router(chats.router)
|
||||||
|
app.include_router(messages.router)
|
||||||
|
app.include_router(auth.router)
|
||||||
@@ -0,0 +1,11 @@
|
|||||||
|
import uuid as uuid_lib
|
||||||
|
from starlette.middleware.base import BaseHTTPMiddleware
|
||||||
|
|
||||||
|
|
||||||
|
class RequestIdMiddleware(BaseHTTPMiddleware):
|
||||||
|
async def dispatch(self, request, call_next):
|
||||||
|
request_id = str(uuid_lib.uuid4())
|
||||||
|
request.state.request_id = request_id
|
||||||
|
response = await call_next(request)
|
||||||
|
response.headers["X-Request-Id"] = request_id
|
||||||
|
return response
|
||||||
@@ -0,0 +1,4 @@
|
|||||||
|
from sqlalchemy.orm import DeclarativeBase
|
||||||
|
|
||||||
|
class Base(DeclarativeBase):
|
||||||
|
pass
|
||||||
@@ -0,0 +1,35 @@
|
|||||||
|
import uuid
|
||||||
|
from datetime import datetime
|
||||||
|
|
||||||
|
from sqlalchemy import String, DateTime, ForeignKey, func
|
||||||
|
from sqlalchemy.orm import Mapped, mapped_column
|
||||||
|
from sqlalchemy.dialects.postgresql import UUID
|
||||||
|
|
||||||
|
from app.models.base import Base
|
||||||
|
|
||||||
|
|
||||||
|
class Chat(Base):
|
||||||
|
__tablename__ = "chats"
|
||||||
|
|
||||||
|
id: Mapped[uuid.UUID] = mapped_column(
|
||||||
|
UUID(as_uuid=True), primary_key=True, default=uuid.uuid4
|
||||||
|
)
|
||||||
|
title: Mapped[str] = mapped_column(String(100), nullable=False)
|
||||||
|
created_at: Mapped[datetime] = mapped_column(
|
||||||
|
DateTime(timezone=True), server_default=func.now()
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
class ChatMember(Base):
|
||||||
|
__tablename__ = "chat_members"
|
||||||
|
|
||||||
|
chat_id: Mapped[uuid.UUID] = mapped_column(
|
||||||
|
UUID(as_uuid=True),
|
||||||
|
ForeignKey("chats.id", ondelete="CASCADE"),
|
||||||
|
primary_key=True,
|
||||||
|
)
|
||||||
|
user_id: Mapped[uuid.UUID] = mapped_column(
|
||||||
|
UUID(as_uuid=True),
|
||||||
|
ForeignKey("users.id", ondelete="CASCADE"),
|
||||||
|
primary_key=True,
|
||||||
|
)
|
||||||
@@ -0,0 +1,34 @@
|
|||||||
|
import uuid
|
||||||
|
from datetime import datetime
|
||||||
|
|
||||||
|
from sqlalchemy import Text, DateTime, ForeignKey, Index, func
|
||||||
|
from sqlalchemy.orm import Mapped, mapped_column
|
||||||
|
from sqlalchemy.dialects.postgresql import UUID
|
||||||
|
|
||||||
|
from app.models.base import Base
|
||||||
|
|
||||||
|
|
||||||
|
class Message(Base):
|
||||||
|
__tablename__ = "messages"
|
||||||
|
|
||||||
|
id: Mapped[uuid.UUID] = mapped_column(
|
||||||
|
UUID(as_uuid=True), primary_key=True, default=uuid.uuid4
|
||||||
|
)
|
||||||
|
chat_id: Mapped[uuid.UUID] = mapped_column(
|
||||||
|
UUID(as_uuid=True),
|
||||||
|
ForeignKey("chats.id", ondelete="CASCADE"),
|
||||||
|
nullable=False,
|
||||||
|
)
|
||||||
|
sender_id: Mapped[uuid.UUID] = mapped_column(
|
||||||
|
UUID(as_uuid=True),
|
||||||
|
ForeignKey("users.id", ondelete="CASCADE"),
|
||||||
|
nullable=False,
|
||||||
|
)
|
||||||
|
text: Mapped[str] = mapped_column(Text, nullable=False)
|
||||||
|
created_at: Mapped[datetime] = mapped_column(
|
||||||
|
DateTime(timezone=True), server_default=func.now()
|
||||||
|
)
|
||||||
|
|
||||||
|
__table_args__ = (
|
||||||
|
Index("ix_messages_chat_created_id", "chat_id", "created_at", "id"),
|
||||||
|
)
|
||||||
@@ -0,0 +1,24 @@
|
|||||||
|
import uuid
|
||||||
|
from datetime import datetime
|
||||||
|
|
||||||
|
from sqlalchemy import String, DateTime, func
|
||||||
|
from sqlalchemy.orm import Mapped, mapped_column
|
||||||
|
from sqlalchemy.dialects.postgresql import UUID
|
||||||
|
|
||||||
|
from app.models.base import Base
|
||||||
|
|
||||||
|
|
||||||
|
class User(Base):
|
||||||
|
__tablename__ = "users"
|
||||||
|
|
||||||
|
id: Mapped[uuid.UUID] = mapped_column(
|
||||||
|
UUID(as_uuid=True), primary_key=True, default=uuid.uuid4
|
||||||
|
)
|
||||||
|
username: Mapped[str] = mapped_column(
|
||||||
|
String(32), unique=True, nullable=False, index=True
|
||||||
|
)
|
||||||
|
display_name: Mapped[str] = mapped_column(String(100), nullable=False)
|
||||||
|
password_hash: Mapped[str] = mapped_column(String(255), nullable=False)
|
||||||
|
created_at: Mapped[datetime] = mapped_column(
|
||||||
|
DateTime(timezone=True), server_default=func.now()
|
||||||
|
)
|
||||||
@@ -0,0 +1,20 @@
|
|||||||
|
def paginate(items: list, limit: int, cursor: str | None):
|
||||||
|
start = 0
|
||||||
|
if cursor is not None:
|
||||||
|
try:
|
||||||
|
start = int(cursor)
|
||||||
|
except ValueError:
|
||||||
|
start = 0
|
||||||
|
|
||||||
|
if start < 0:
|
||||||
|
start = 0
|
||||||
|
|
||||||
|
page = items[start : start + limit]
|
||||||
|
next_index = start + limit
|
||||||
|
|
||||||
|
if next_index < len(items):
|
||||||
|
next_cursor = str(next_index)
|
||||||
|
else:
|
||||||
|
next_cursor = None
|
||||||
|
|
||||||
|
return page, next_cursor
|
||||||
@@ -0,0 +1,9 @@
|
|||||||
|
import redis.asyncio as redis
|
||||||
|
from app.config import REDIS_URL
|
||||||
|
|
||||||
|
redis_client = redis.from_url(
|
||||||
|
REDIS_URL,
|
||||||
|
decode_responses=True,
|
||||||
|
socket_timeout=3,
|
||||||
|
socket_connect_timeout=3,
|
||||||
|
)
|
||||||
@@ -0,0 +1,83 @@
|
|||||||
|
from fastapi import APIRouter, Depends, HTTPException, status
|
||||||
|
from fastapi.security import HTTPBasic, HTTPBasicCredentials, HTTPAuthorizationCredentials
|
||||||
|
from pydantic import BaseModel, ConfigDict, field_serializer
|
||||||
|
from app.redis_client import redis_client
|
||||||
|
from sqlalchemy import select
|
||||||
|
from sqlalchemy.ext.asyncio import AsyncSession
|
||||||
|
import uuid
|
||||||
|
from datetime import datetime
|
||||||
|
|
||||||
|
from app.database import async_session_maker
|
||||||
|
from app.models.user import User
|
||||||
|
from app.security import verify_password, create_session, delete_session, bearer_scheme
|
||||||
|
|
||||||
|
router = APIRouter(prefix="/api/v1/auth", tags=["auth"])
|
||||||
|
security = HTTPBasic(realm="messenger")
|
||||||
|
|
||||||
|
|
||||||
|
class UserResponse(BaseModel):
|
||||||
|
id: uuid.UUID
|
||||||
|
username: str
|
||||||
|
display_name: str
|
||||||
|
created_at: datetime
|
||||||
|
model_config = ConfigDict(from_attributes=True)
|
||||||
|
|
||||||
|
@field_serializer('created_at')
|
||||||
|
def serialize_dt(self, dt: datetime):
|
||||||
|
return dt.isoformat().replace("+00:00", "Z")
|
||||||
|
|
||||||
|
|
||||||
|
class SessionResponse(BaseModel):
|
||||||
|
token: str
|
||||||
|
token_type: str
|
||||||
|
expires_at: str
|
||||||
|
user: UserResponse
|
||||||
|
|
||||||
|
@field_serializer('expires_at')
|
||||||
|
def serialize_dt(self, dt_str: str):
|
||||||
|
if dt_str and dt_str.endswith("+00:00"):
|
||||||
|
return dt_str.replace("+00:00", "Z")
|
||||||
|
return dt_str
|
||||||
|
|
||||||
|
|
||||||
|
# Basic Auth в Bearer Token
|
||||||
|
@router.post("/sessions", status_code=201, response_model=SessionResponse)
|
||||||
|
async def login(credentials: HTTPBasicCredentials = Depends(security)):
|
||||||
|
async with async_session_maker() as session:
|
||||||
|
result = await session.execute(select(User).where(User.username == credentials.username))
|
||||||
|
user = result.scalar_one_or_none()
|
||||||
|
|
||||||
|
if not user or not verify_password(credentials.password, user.password_hash):
|
||||||
|
raise HTTPException(
|
||||||
|
status_code=status.HTTP_401_UNAUTHORIZED,
|
||||||
|
detail="Incorrect username or password",
|
||||||
|
headers={"WWW-Authenticate": 'Basic realm="messenger", charset="UTF-8"'},
|
||||||
|
)
|
||||||
|
|
||||||
|
session_data = await create_session(user.id)
|
||||||
|
|
||||||
|
session_data["user"] = user
|
||||||
|
|
||||||
|
return session_data
|
||||||
|
|
||||||
|
@router.delete("/sessions/current", status_code=204)
|
||||||
|
async def logout(credentials: HTTPAuthorizationCredentials = Depends(bearer_scheme)):
|
||||||
|
if not credentials:
|
||||||
|
raise HTTPException(
|
||||||
|
status_code=status.HTTP_401_UNAUTHORIZED,
|
||||||
|
detail="Not authenticated",
|
||||||
|
headers={"WWW-Authenticate": 'Bearer realm="messenger"'},
|
||||||
|
)
|
||||||
|
|
||||||
|
token = credentials.credentials
|
||||||
|
|
||||||
|
user_id = await redis_client.get(f"session:{token}")
|
||||||
|
if not user_id:
|
||||||
|
raise HTTPException(
|
||||||
|
status_code=status.HTTP_401_UNAUTHORIZED,
|
||||||
|
detail="Invalid or expired token",
|
||||||
|
headers={"WWW-Authenticate": 'Bearer realm="messenger"'},
|
||||||
|
)
|
||||||
|
|
||||||
|
await delete_session(token)
|
||||||
|
return None
|
||||||
@@ -0,0 +1,139 @@
|
|||||||
|
import uuid
|
||||||
|
from datetime import datetime
|
||||||
|
from fastapi import APIRouter, HTTPException, Depends
|
||||||
|
from pydantic import BaseModel, Field, field_validator, ConfigDict, field_serializer
|
||||||
|
from sqlalchemy.ext.asyncio import AsyncSession
|
||||||
|
from sqlalchemy import select
|
||||||
|
|
||||||
|
from app.models.chat import Chat, ChatMember
|
||||||
|
from app.models.user import User
|
||||||
|
from app.security import get_current_user
|
||||||
|
from app.dependencies import get_session
|
||||||
|
from app.pagination import paginate
|
||||||
|
|
||||||
|
router = APIRouter(prefix="/api/v1/chats", tags=["chats"])
|
||||||
|
|
||||||
|
|
||||||
|
class CreateChat(BaseModel):
|
||||||
|
model_config = ConfigDict(extra="forbid")
|
||||||
|
title: str = Field(min_length=1, max_length=100)
|
||||||
|
member_ids: list[str] = Field(min_length=1, max_length=100)
|
||||||
|
|
||||||
|
@field_validator("member_ids")
|
||||||
|
@classmethod
|
||||||
|
def unique_members(cls, v):
|
||||||
|
if len(set(v)) != len(v):
|
||||||
|
raise ValueError("member_ids должны быть уникальными")
|
||||||
|
return v
|
||||||
|
|
||||||
|
class ChatResponse(BaseModel):
|
||||||
|
id: uuid.UUID
|
||||||
|
title: str
|
||||||
|
member_ids: list[uuid.UUID]
|
||||||
|
created_at: datetime
|
||||||
|
model_config = ConfigDict(from_attributes=True)
|
||||||
|
|
||||||
|
@field_serializer('created_at')
|
||||||
|
def serialize_dt(self, dt: datetime):
|
||||||
|
return dt.isoformat().replace("+00:00", "Z")
|
||||||
|
|
||||||
|
|
||||||
|
@router.post("", status_code=201)
|
||||||
|
async def create_chat(
|
||||||
|
payload: CreateChat,
|
||||||
|
user: User = Depends(get_current_user),
|
||||||
|
session: AsyncSession = Depends(get_session)
|
||||||
|
):
|
||||||
|
if str(user.id) not in payload.member_ids:
|
||||||
|
raise HTTPException(status_code=400, detail="Пользователь должен быть участником чата")
|
||||||
|
|
||||||
|
for member_id in payload.member_ids:
|
||||||
|
result = await session.execute(select(User).where(User.id == member_id))
|
||||||
|
if not result.scalar_one_or_none():
|
||||||
|
raise HTTPException(status_code=400, detail=f"несуществующий пользователь: {member_id}")
|
||||||
|
|
||||||
|
chat = Chat(title=payload.title)
|
||||||
|
session.add(chat)
|
||||||
|
await session.flush()
|
||||||
|
|
||||||
|
for member_id in payload.member_ids:
|
||||||
|
session.add(ChatMember(chat_id=chat.id, user_id=member_id))
|
||||||
|
|
||||||
|
await session.commit()
|
||||||
|
await session.refresh(chat)
|
||||||
|
|
||||||
|
return {
|
||||||
|
"id": chat.id,
|
||||||
|
"title": chat.title,
|
||||||
|
"member_ids": payload.member_ids,
|
||||||
|
"created_at": chat.created_at.isoformat().replace("+00:00", "Z"),
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@router.get("/{chat_id}")
|
||||||
|
async def get_chat(
|
||||||
|
chat_id: str,
|
||||||
|
user: User = Depends(get_current_user),
|
||||||
|
session: AsyncSession = Depends(get_session)
|
||||||
|
):
|
||||||
|
result = await session.execute(select(Chat).where(Chat.id == chat_id))
|
||||||
|
chat = result.scalar_one_or_none()
|
||||||
|
|
||||||
|
if not chat:
|
||||||
|
raise HTTPException(status_code=404, detail="чат не найден")
|
||||||
|
|
||||||
|
result = await session.execute(
|
||||||
|
select(ChatMember).where(ChatMember.chat_id == chat.id, ChatMember.user_id == user.id)
|
||||||
|
)
|
||||||
|
if not result.scalar_one_or_none():
|
||||||
|
raise HTTPException(status_code=404, detail="чат не найден")
|
||||||
|
|
||||||
|
result = await session.execute(select(ChatMember.user_id).where(ChatMember.chat_id == chat.id))
|
||||||
|
member_ids = []
|
||||||
|
for row in result.all():
|
||||||
|
user_id = row[0]
|
||||||
|
member_ids.append(str(user_id))
|
||||||
|
|
||||||
|
return {
|
||||||
|
"id": chat.id,
|
||||||
|
"title": chat.title,
|
||||||
|
"member_ids": member_ids,
|
||||||
|
"created_at": chat.created_at.isoformat().replace("+00:00", "Z"),
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@router.get("")
|
||||||
|
async def list_chats(
|
||||||
|
limit: int = 20,
|
||||||
|
cursor: str | None = None,
|
||||||
|
user: User = Depends(get_current_user),
|
||||||
|
session: AsyncSession = Depends(get_session)
|
||||||
|
):
|
||||||
|
if limit < 1 or limit > 100:
|
||||||
|
raise HTTPException(status_code=400, detail="limit должен быть от 1 до 100")
|
||||||
|
|
||||||
|
result = await session.execute(
|
||||||
|
select(Chat)
|
||||||
|
.join(ChatMember, Chat.id == ChatMember.chat_id)
|
||||||
|
.where(ChatMember.user_id == user.id)
|
||||||
|
.order_by(Chat.created_at, Chat.id)
|
||||||
|
)
|
||||||
|
chats = result.scalars().all()
|
||||||
|
|
||||||
|
my_chats = []
|
||||||
|
for chat in chats:
|
||||||
|
result = await session.execute(select(ChatMember.user_id).where(ChatMember.chat_id == chat.id))
|
||||||
|
member_ids = []
|
||||||
|
for row in result.all():
|
||||||
|
user_id = row[0]
|
||||||
|
member_ids.append(str(user_id))
|
||||||
|
|
||||||
|
my_chats.append({
|
||||||
|
"id": chat.id,
|
||||||
|
"title": chat.title,
|
||||||
|
"member_ids": member_ids,
|
||||||
|
"created_at": chat.created_at.isoformat().replace("+00:00", "Z"),
|
||||||
|
})
|
||||||
|
|
||||||
|
page, next_cursor = paginate(my_chats, limit, cursor)
|
||||||
|
return {"items": page, "next_cursor": next_cursor}
|
||||||
@@ -0,0 +1,34 @@
|
|||||||
|
from fastapi import APIRouter
|
||||||
|
from fastapi import HTTPException
|
||||||
|
from sqlalchemy import text
|
||||||
|
from app.database import async_session_maker
|
||||||
|
from app.redis_client import redis_client
|
||||||
|
|
||||||
|
|
||||||
|
router = APIRouter(tags=["health"])
|
||||||
|
|
||||||
|
|
||||||
|
@router.get("/health/live")
|
||||||
|
def live():
|
||||||
|
return {"status": "ok"}
|
||||||
|
|
||||||
|
|
||||||
|
@router.get("/health/ready")
|
||||||
|
async def ready():
|
||||||
|
try:
|
||||||
|
async with async_session_maker() as session:
|
||||||
|
await session.execute(text("SELECT 1"))
|
||||||
|
|
||||||
|
await redis_client.ping()
|
||||||
|
|
||||||
|
return {"status": "ok"}
|
||||||
|
except Exception:
|
||||||
|
raise HTTPException(status_code=503, detail="unavailable")
|
||||||
|
|
||||||
|
@router.get("/")
|
||||||
|
def home():
|
||||||
|
return {
|
||||||
|
"service": "MTUSI Messenger",
|
||||||
|
"version": "1.1.0",
|
||||||
|
"docs": "/docs",
|
||||||
|
}
|
||||||
@@ -0,0 +1,150 @@
|
|||||||
|
import uuid
|
||||||
|
from datetime import datetime
|
||||||
|
from fastapi import APIRouter, HTTPException, Depends, Header
|
||||||
|
from pydantic import BaseModel, Field, ConfigDict, field_serializer
|
||||||
|
from sqlalchemy.ext.asyncio import AsyncSession
|
||||||
|
from sqlalchemy import select
|
||||||
|
from app.redis_client import redis_client
|
||||||
|
import json
|
||||||
|
|
||||||
|
from app.models.message import Message
|
||||||
|
from app.models.chat import Chat, ChatMember
|
||||||
|
from app.models.user import User
|
||||||
|
from app.security import get_current_user
|
||||||
|
from app.dependencies import get_session
|
||||||
|
|
||||||
|
router = APIRouter(prefix="/api/v1/chats/{chat_id}/messages", tags=["messages"])
|
||||||
|
|
||||||
|
|
||||||
|
class CreateMessage(BaseModel):
|
||||||
|
model_config = ConfigDict(extra="forbid")
|
||||||
|
text: str = Field(min_length=1, max_length=4000)
|
||||||
|
|
||||||
|
|
||||||
|
class MessageResponse(BaseModel):
|
||||||
|
id: uuid.UUID
|
||||||
|
chat_id: uuid.UUID
|
||||||
|
sender_id: uuid.UUID
|
||||||
|
text: str
|
||||||
|
created_at: datetime
|
||||||
|
model_config = ConfigDict(from_attributes=True)
|
||||||
|
|
||||||
|
@field_serializer('created_at')
|
||||||
|
def serialize_dt(self, dt: datetime):
|
||||||
|
return dt.isoformat().replace("+00:00", "Z")
|
||||||
|
|
||||||
|
|
||||||
|
async def check_chat_access(chat_id: str, user_id: uuid.UUID, session: AsyncSession):
|
||||||
|
chat = await session.get(Chat, chat_id)
|
||||||
|
if not chat:
|
||||||
|
raise HTTPException(status_code=404, detail="чат не найден")
|
||||||
|
|
||||||
|
result = await session.execute(
|
||||||
|
select(ChatMember).where(ChatMember.chat_id == chat.id, ChatMember.user_id == user_id)
|
||||||
|
)
|
||||||
|
if not result.scalar_one_or_none():
|
||||||
|
raise HTTPException(status_code=404, detail="чат не найден")
|
||||||
|
return chat
|
||||||
|
|
||||||
|
|
||||||
|
@router.post("", status_code=201, response_model=MessageResponse)
|
||||||
|
async def create_message(
|
||||||
|
chat_id: str,
|
||||||
|
payload: CreateMessage,
|
||||||
|
idempotency_key: str = Header(
|
||||||
|
...,
|
||||||
|
alias="Idempotency-Key",
|
||||||
|
min_length=1,
|
||||||
|
max_length=128,
|
||||||
|
pattern=r"^[A-Za-z0-9._:-]+$",
|
||||||
|
),
|
||||||
|
user: User = Depends(get_current_user),
|
||||||
|
session: AsyncSession = Depends(get_session)
|
||||||
|
):
|
||||||
|
await check_chat_access(chat_id, user.id, session)
|
||||||
|
|
||||||
|
redis_key = f"idem:{user.id}:{chat_id}:{idempotency_key}"
|
||||||
|
body = payload.model_dump()
|
||||||
|
|
||||||
|
raw = await redis_client.get(redis_key)
|
||||||
|
if raw:
|
||||||
|
stored = json.loads(raw)
|
||||||
|
if stored["state"] == "done":
|
||||||
|
if stored["request_body"] == body:
|
||||||
|
return stored["response"]
|
||||||
|
raise HTTPException(status_code=409, detail="Idempotency-Key переиспользован с другим телом запроса")
|
||||||
|
raise HTTPException(status_code=409, detail="Запрос с этим Idempotency-Key ещё обрабатывается")
|
||||||
|
|
||||||
|
acquired = await redis_client.set(
|
||||||
|
redis_key,
|
||||||
|
json.dumps({"state": "processing", "request_body": body}),
|
||||||
|
nx=True,
|
||||||
|
ex=86400,
|
||||||
|
)
|
||||||
|
if not acquired:
|
||||||
|
raise HTTPException(409, "Одновременный запрос с тем же самым Idempotency-Key")
|
||||||
|
|
||||||
|
message = Message(chat_id=chat_id, sender_id=user.id, text=payload.text)
|
||||||
|
session.add(message)
|
||||||
|
await session.commit()
|
||||||
|
await session.refresh(message)
|
||||||
|
|
||||||
|
response_data = {
|
||||||
|
"id": str(message.id),
|
||||||
|
"chat_id": str(message.chat_id),
|
||||||
|
"sender_id": str(message.sender_id),
|
||||||
|
"text": message.text,
|
||||||
|
"created_at": message.created_at.isoformat().replace("+00:00", "Z"),
|
||||||
|
}
|
||||||
|
|
||||||
|
await redis_client.set(
|
||||||
|
redis_key,
|
||||||
|
json.dumps({"state": "done",
|
||||||
|
"request_body": body,
|
||||||
|
"response": response_data}),
|
||||||
|
ex=86400,
|
||||||
|
)
|
||||||
|
|
||||||
|
return response_data
|
||||||
|
|
||||||
|
@router.get("")
|
||||||
|
async def list_messages(
|
||||||
|
chat_id: str,
|
||||||
|
limit: int = 50,
|
||||||
|
cursor: str | None = None,
|
||||||
|
user: User = Depends(get_current_user),
|
||||||
|
session: AsyncSession = Depends(get_session)
|
||||||
|
):
|
||||||
|
if limit < 1 or limit > 100:
|
||||||
|
raise HTTPException(status_code=400, detail="limit должен быть от 1 до 100")
|
||||||
|
|
||||||
|
await check_chat_access(chat_id, user.id, session)
|
||||||
|
|
||||||
|
|
||||||
|
offset = int(cursor) if cursor else 0
|
||||||
|
|
||||||
|
result = await session.execute(
|
||||||
|
select(Message)
|
||||||
|
.where(Message.chat_id == chat_id)
|
||||||
|
.order_by(Message.created_at, Message.id)
|
||||||
|
.limit(limit + 1)
|
||||||
|
.offset(offset)
|
||||||
|
)
|
||||||
|
msgs = result.scalars().all()
|
||||||
|
|
||||||
|
has_next = len(msgs) > limit
|
||||||
|
if has_next:
|
||||||
|
msgs = msgs[:limit]
|
||||||
|
|
||||||
|
my_messages = [
|
||||||
|
{
|
||||||
|
"id": m.id,
|
||||||
|
"chat_id": m.chat_id,
|
||||||
|
"sender_id": m.sender_id,
|
||||||
|
"text": m.text,
|
||||||
|
"created_at": m.created_at.isoformat().replace("+00:00", "Z"),
|
||||||
|
} for m in msgs
|
||||||
|
]
|
||||||
|
|
||||||
|
next_cursor = str(offset + limit) if has_next else None
|
||||||
|
return {"items": my_messages, "next_cursor": next_cursor}
|
||||||
@@ -0,0 +1,55 @@
|
|||||||
|
import uuid
|
||||||
|
from datetime import datetime
|
||||||
|
from fastapi import APIRouter, HTTPException, Depends
|
||||||
|
from pydantic import BaseModel, Field, ConfigDict, field_serializer
|
||||||
|
from sqlalchemy.ext.asyncio import AsyncSession
|
||||||
|
from sqlalchemy import select
|
||||||
|
from sqlalchemy.exc import IntegrityError
|
||||||
|
from app.models.user import User
|
||||||
|
from app.security import get_password_hash, get_current_user
|
||||||
|
from app.dependencies import get_session
|
||||||
|
|
||||||
|
router = APIRouter(prefix="/api/v1/users", tags=["users"])
|
||||||
|
|
||||||
|
class CreateUser(BaseModel):
|
||||||
|
model_config = ConfigDict(extra="forbid")
|
||||||
|
username: str = Field(pattern=r"^[a-z0-9_]{3,32}$")
|
||||||
|
display_name: str = Field(min_length=1, max_length=100)
|
||||||
|
password: str = Field(min_length=5, max_length=128)
|
||||||
|
|
||||||
|
class UserResponse(BaseModel):
|
||||||
|
id: uuid.UUID
|
||||||
|
username: str
|
||||||
|
display_name: str
|
||||||
|
created_at: datetime
|
||||||
|
model_config = ConfigDict(from_attributes=True)
|
||||||
|
|
||||||
|
@field_serializer('created_at')
|
||||||
|
def serialize_dt(self, dt: datetime):
|
||||||
|
return dt.isoformat().replace("+00:00", "Z")
|
||||||
|
|
||||||
|
@router.post("", status_code=201, response_model=UserResponse)
|
||||||
|
async def register_user(payload: CreateUser, session: AsyncSession = Depends(get_session)):
|
||||||
|
result = await session.execute(select(User).where(User.username == payload.username))
|
||||||
|
if result.scalar_one_or_none():
|
||||||
|
raise HTTPException(status_code=409, detail="Имя пользователя уже существует")
|
||||||
|
|
||||||
|
user = User(
|
||||||
|
username=payload.username,
|
||||||
|
display_name=payload.display_name,
|
||||||
|
password_hash=get_password_hash(payload.password)
|
||||||
|
)
|
||||||
|
session.add(user)
|
||||||
|
|
||||||
|
try:
|
||||||
|
await session.commit()
|
||||||
|
except IntegrityError:
|
||||||
|
await session.rollback()
|
||||||
|
raise HTTPException(status_code=409, detail="Имя пользователя уже существует")
|
||||||
|
|
||||||
|
await session.refresh(user)
|
||||||
|
return user
|
||||||
|
|
||||||
|
@router.get("/me", response_model=UserResponse)
|
||||||
|
async def current_user(user: User = Depends(get_current_user)):
|
||||||
|
return user
|
||||||
@@ -0,0 +1,81 @@
|
|||||||
|
import secrets
|
||||||
|
from datetime import datetime, timezone, timedelta
|
||||||
|
from passlib.context import CryptContext
|
||||||
|
from fastapi import Depends, HTTPException, status
|
||||||
|
from fastapi.security import HTTPBearer, HTTPAuthorizationCredentials
|
||||||
|
from sqlalchemy import select
|
||||||
|
from app.database import async_session_maker
|
||||||
|
from app.models.user import User
|
||||||
|
from app.redis_client import redis_client
|
||||||
|
from app.config import SESSION_TTL_SECONDS
|
||||||
|
|
||||||
|
pwd_context = CryptContext(schemes=["bcrypt"], deprecated="auto")
|
||||||
|
bearer_scheme = HTTPBearer(auto_error=False)
|
||||||
|
|
||||||
|
def get_password_hash(password: str) -> str:
|
||||||
|
return pwd_context.hash(password)
|
||||||
|
|
||||||
|
|
||||||
|
def verify_password(plain: str, hashed: str) -> bool:
|
||||||
|
return pwd_context.verify(plain, hashed)
|
||||||
|
|
||||||
|
|
||||||
|
async def create_session(user_id: str) -> dict:
|
||||||
|
token = secrets.token_urlsafe(32)
|
||||||
|
expires_at = datetime.now(timezone.utc) + timedelta(seconds=SESSION_TTL_SECONDS)
|
||||||
|
|
||||||
|
await redis_client.setex(
|
||||||
|
name=f"session:{token}",
|
||||||
|
time=SESSION_TTL_SECONDS,
|
||||||
|
value=str(user_id),
|
||||||
|
)
|
||||||
|
|
||||||
|
return {
|
||||||
|
"token": token,
|
||||||
|
"token_type": "Bearer",
|
||||||
|
"expires_at": expires_at.isoformat().replace("+00:00", "Z"),
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
async def delete_session(token: str) -> None:
|
||||||
|
await redis_client.delete(f"session:{token}")
|
||||||
|
|
||||||
|
|
||||||
|
async def get_current_user(credentials: HTTPAuthorizationCredentials = Depends(bearer_scheme)):
|
||||||
|
if not credentials:
|
||||||
|
raise HTTPException(
|
||||||
|
status_code=status.HTTP_401_UNAUTHORIZED,
|
||||||
|
detail="Not authenticated",
|
||||||
|
headers={"WWW-Authenticate": 'Bearer realm="messenger"'},
|
||||||
|
)
|
||||||
|
|
||||||
|
token = credentials.credentials
|
||||||
|
|
||||||
|
|
||||||
|
try:
|
||||||
|
user_id = await redis_client.get(f"session:{token}")
|
||||||
|
except Exception:
|
||||||
|
raise HTTPException(
|
||||||
|
status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
|
||||||
|
detail="Внутренняя ошибка сервера"
|
||||||
|
)
|
||||||
|
|
||||||
|
if not user_id:
|
||||||
|
raise HTTPException(
|
||||||
|
status_code=status.HTTP_401_UNAUTHORIZED,
|
||||||
|
detail="Invalid or expired token",
|
||||||
|
headers={"WWW-Authenticate": 'Bearer realm="messenger"'},
|
||||||
|
)
|
||||||
|
|
||||||
|
async with async_session_maker() as session:
|
||||||
|
result = await session.execute(select(User).where(User.id == user_id))
|
||||||
|
user = result.scalar_one_or_none()
|
||||||
|
|
||||||
|
if not user:
|
||||||
|
raise HTTPException(
|
||||||
|
status_code=status.HTTP_401_UNAUTHORIZED,
|
||||||
|
detail="User not found",
|
||||||
|
headers={"WWW-Authenticate": 'Bearer realm="messenger"'},
|
||||||
|
)
|
||||||
|
|
||||||
|
return user
|
||||||
@@ -0,0 +1,9 @@
|
|||||||
|
import threading
|
||||||
|
|
||||||
|
users_lock = threading.Lock()
|
||||||
|
messages_lock = threading.Lock()
|
||||||
|
|
||||||
|
users_by_id: dict[str, dict] = {}
|
||||||
|
users_by_username: dict[str, dict] = {}
|
||||||
|
chats_by_id: dict[str, dict] = {}
|
||||||
|
messages_by_chat: dict[str, list[dict]] = {}
|
||||||
@@ -0,0 +1,92 @@
|
|||||||
|
services:
|
||||||
|
db:
|
||||||
|
image: postgres:16-alpine
|
||||||
|
container_name: mtusi_messenger_db
|
||||||
|
environment:
|
||||||
|
POSTGRES_USER: ${POSTGRES_USER}
|
||||||
|
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
|
||||||
|
POSTGRES_DB: ${POSTGRES_DB}
|
||||||
|
command: postgres -c synchronous_commit=off
|
||||||
|
volumes:
|
||||||
|
- postgres_data:/var/lib/postgresql/data
|
||||||
|
ports:
|
||||||
|
- "5432:5432"
|
||||||
|
healthcheck:
|
||||||
|
test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER} -d ${POSTGRES_DB}"]
|
||||||
|
interval: 5s
|
||||||
|
timeout: 5s
|
||||||
|
retries: 5
|
||||||
|
restart: unless-stopped
|
||||||
|
|
||||||
|
redis:
|
||||||
|
image: redis:7-alpine
|
||||||
|
container_name: mtusi_messenger_redis
|
||||||
|
command: redis-server --appendonly yes
|
||||||
|
volumes:
|
||||||
|
- redis_data:/data
|
||||||
|
ports:
|
||||||
|
- "6379:6379"
|
||||||
|
healthcheck:
|
||||||
|
test: ["CMD", "redis-cli", "ping"]
|
||||||
|
interval: 5s
|
||||||
|
timeout: 3s
|
||||||
|
retries: 5
|
||||||
|
restart: unless-stopped
|
||||||
|
|
||||||
|
app1:
|
||||||
|
build: .
|
||||||
|
environment:
|
||||||
|
DATABASE_URL: ${DATABASE_URL}
|
||||||
|
REDIS_URL: ${REDIS_URL}
|
||||||
|
SESSION_TTL_SECONDS: ${SESSION_TTL_SECONDS}
|
||||||
|
deploy:
|
||||||
|
resources:
|
||||||
|
limits:
|
||||||
|
cpus: "0.5"
|
||||||
|
memory: 512M
|
||||||
|
depends_on:
|
||||||
|
db:
|
||||||
|
condition: service_healthy
|
||||||
|
redis:
|
||||||
|
condition: service_healthy
|
||||||
|
volumes:
|
||||||
|
- ./app:/app/app
|
||||||
|
- ./alembic:/app/alembic
|
||||||
|
- ./alembic.ini:/app/alembic.ini
|
||||||
|
|
||||||
|
app2:
|
||||||
|
build: .
|
||||||
|
environment:
|
||||||
|
DATABASE_URL: ${DATABASE_URL}
|
||||||
|
REDIS_URL: ${REDIS_URL}
|
||||||
|
SESSION_TTL_SECONDS: ${SESSION_TTL_SECONDS}
|
||||||
|
deploy:
|
||||||
|
resources:
|
||||||
|
limits:
|
||||||
|
cpus: "0.5"
|
||||||
|
memory: 512M
|
||||||
|
depends_on:
|
||||||
|
db:
|
||||||
|
condition: service_healthy
|
||||||
|
redis:
|
||||||
|
condition: service_healthy
|
||||||
|
volumes:
|
||||||
|
- ./app:/app/app
|
||||||
|
- ./alembic:/app/alembic
|
||||||
|
- ./alembic.ini:/app/alembic.ini
|
||||||
|
|
||||||
|
nginx:
|
||||||
|
image: nginx:alpine
|
||||||
|
container_name: mtusi_messenger_nginx
|
||||||
|
ports:
|
||||||
|
- "127.0.0.1:8080:80"
|
||||||
|
volumes:
|
||||||
|
- ./nginx/nginx.conf:/etc/nginx/nginx.conf:ro
|
||||||
|
depends_on:
|
||||||
|
- app1
|
||||||
|
- app2
|
||||||
|
|
||||||
|
|
||||||
|
volumes:
|
||||||
|
postgres_data:
|
||||||
|
redis_data:
|
||||||
@@ -0,0 +1,13 @@
|
|||||||
|
QUERY PLAN
|
||||||
|
-----------------------------------------------------------------------------------------------------------------------------------------------------
|
||||||
|
Limit (cost=0.42..5.54 rows=50 width=66) (actual time=0.103..0.111 rows=50 loops=1)
|
||||||
|
Buffers: shared hit=4
|
||||||
|
-> Index Scan using ix_messages_chat_created_id on messages (cost=0.42..8222.03 rows=80203 width=66) (actual time=0.102..0.107 rows=50 loops=1)
|
||||||
|
Index Cond: (chat_id = '66666666-6666-4666-8666-666666666666'::uuid)
|
||||||
|
Buffers: shared hit=4
|
||||||
|
Planning:
|
||||||
|
Buffers: shared hit=107
|
||||||
|
Planning Time: 0.865 ms
|
||||||
|
Execution Time: 0.168 ms
|
||||||
|
(9 rows)
|
||||||
|
|
||||||
@@ -0,0 +1,22 @@
|
|||||||
|
QUERY PLAN
|
||||||
|
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------
|
||||||
|
Limit (cost=6279.67..6285.42 rows=50 width=66) (actual time=7.323..8.152 rows=50 loops=1)
|
||||||
|
Buffers: shared hit=1063 read=72
|
||||||
|
-> Gather Merge (cost=6279.67..11696.05 rows=47099 width=66) (actual time=7.322..8.148 rows=50 loops=1)
|
||||||
|
Workers Planned: 1
|
||||||
|
Workers Launched: 1
|
||||||
|
Buffers: shared hit=1063 read=72
|
||||||
|
-> Sort (cost=5279.66..5397.40 rows=47099 width=66) (actual time=6.368..6.368 rows=26 loops=2)
|
||||||
|
Sort Key: created_at, id
|
||||||
|
Sort Method: top-N heapsort Memory: 38kB
|
||||||
|
Buffers: shared hit=1063 read=72
|
||||||
|
Worker 0: Sort Method: top-N heapsort Memory: 38kB
|
||||||
|
-> Parallel Index Scan using ix_messages_chat_only on messages (cost=0.42..3715.06 rows=47099 width=66) (actual time=0.031..2.837 rows=40000 loops=2)
|
||||||
|
--More-- ␍ ␍ Index Cond: (chat_id = '66666666-6666-4666-8666-66666666666--More-- ␍ ␍6'::uuid)
|
||||||
|
--More-- ␍ ␍ Buffers: shared hit=1048 read=72
|
||||||
|
--More-- ␍ ␍ Planning:
|
||||||
|
--More-- ␍ ␍ Buffers: shared hit=98 read=1
|
||||||
|
--More-- ␍ ␍ Planning Time: 0.335 ms
|
||||||
|
--More-- ␍ ␍ Execution Time: 8.200 ms
|
||||||
|
--More-- ␍ ␍(18 rows)
|
||||||
|
--More-- ␍ ␍
|
||||||
@@ -0,0 +1,29 @@
|
|||||||
|
./scripts/failover-test.sh app1
|
||||||
|
Останавливаю app1
|
||||||
|
16:50:48.3N
|
||||||
|
Останавливаю app1...
|
||||||
|
app1 остановлен
|
||||||
|
|
||||||
|
Шлю запросы каждые 0.5 сек, смотрю код и x-instance-id
|
||||||
|
16:50:48.3N code=200 x-instance-id: 4749a273-c09f-47b2-9172-f373b786233b
|
||||||
|
16:50:51.3N code=200 x-instance-id: 4749a273-c09f-47b2-9172-f373b786233b
|
||||||
|
16:50:51.3N code=200 x-instance-id: 4749a273-c09f-47b2-9172-f373b786233b
|
||||||
|
16:50:52.3N code=200 x-instance-id: 4749a273-c09f-47b2-9172-f373b786233b
|
||||||
|
16:50:52.3N code=200 x-instance-id: 4749a273-c09f-47b2-9172-f373b786233b
|
||||||
|
16:50:53.3N code=200 x-instance-id: 4749a273-c09f-47b2-9172-f373b786233b
|
||||||
|
16:50:53.3N code=200 x-instance-id: 4749a273-c09f-47b2-9172-f373b786233b
|
||||||
|
16:50:54.3N code=200 x-instance-id: 4749a273-c09f-47b2-9172-f373b786233b
|
||||||
|
16:50:55.3N code=200 x-instance-id: 4749a273-c09f-47b2-9172-f373b786233b
|
||||||
|
16:50:55.3N code=200 x-instance-id: 4749a273-c09f-47b2-9172-f373b786233b
|
||||||
|
16:50:56.3N code=200 x-instance-id: 4749a273-c09f-47b2-9172-f373b786233b
|
||||||
|
16:50:58.3N code=200 x-instance-id: 4749a273-c09f-47b2-9172-f373b786233b
|
||||||
|
16:50:59.3N code=200 x-instance-id: 4749a273-c09f-47b2-9172-f373b786233b
|
||||||
|
16:50:59.3N code=200 x-instance-id: 4749a273-c09f-47b2-9172-f373b786233b
|
||||||
|
16:51:00.3N code=200 x-instance-id: 4749a273-c09f-47b2-9172-f373b786233b
|
||||||
|
16:51:00.3N code=200 x-instance-id: 4749a273-c09f-47b2-9172-f373b786233b
|
||||||
|
16:51:01.3N code=200 x-instance-id: 4749a273-c09f-47b2-9172-f373b786233b
|
||||||
|
16:51:02.3N code=200 x-instance-id: 4749a273-c09f-47b2-9172-f373b786233b
|
||||||
|
16:51:02.3N code=200 x-instance-id: 4749a273-c09f-47b2-9172-f373b786233b
|
||||||
|
16:51:03.3N code=200 x-instance-id: 4749a273-c09f-47b2-9172-f373b786233b
|
||||||
|
|
||||||
|
Поднимаю app1 обратно
|
||||||
@@ -0,0 +1,29 @@
|
|||||||
|
./scripts/failover-test.sh app2
|
||||||
|
Останавливаю app2
|
||||||
|
16:51:08.3N
|
||||||
|
Останавливаю app2...
|
||||||
|
app2 остановлен
|
||||||
|
|
||||||
|
Шлю запросы каждые 0.5 сек, смотрю код и x-instance-id
|
||||||
|
16:51:09.3N code=200 x-instance-id: 534c1846-b123-481b-a9c4-71c7049315ae
|
||||||
|
16:51:11.3N code=200 x-instance-id: 534c1846-b123-481b-a9c4-71c7049315ae
|
||||||
|
16:51:14.3N code=200 x-instance-id: 534c1846-b123-481b-a9c4-71c7049315ae
|
||||||
|
16:51:14.3N code=200 x-instance-id: 534c1846-b123-481b-a9c4-71c7049315ae
|
||||||
|
16:51:15.3N code=200 x-instance-id: 534c1846-b123-481b-a9c4-71c7049315ae
|
||||||
|
16:51:15.3N code=200 x-instance-id: 534c1846-b123-481b-a9c4-71c7049315ae
|
||||||
|
16:51:16.3N code=200 x-instance-id: 534c1846-b123-481b-a9c4-71c7049315ae
|
||||||
|
16:51:17.3N code=200 x-instance-id: 534c1846-b123-481b-a9c4-71c7049315ae
|
||||||
|
16:51:17.3N code=200 x-instance-id: 534c1846-b123-481b-a9c4-71c7049315ae
|
||||||
|
16:51:18.3N code=200 x-instance-id: 534c1846-b123-481b-a9c4-71c7049315ae
|
||||||
|
16:51:18.3N code=200 x-instance-id: 534c1846-b123-481b-a9c4-71c7049315ae
|
||||||
|
16:51:19.3N code=200 x-instance-id: 534c1846-b123-481b-a9c4-71c7049315ae
|
||||||
|
16:51:21.3N code=200 x-instance-id: 534c1846-b123-481b-a9c4-71c7049315ae
|
||||||
|
16:51:22.3N code=200 x-instance-id: 534c1846-b123-481b-a9c4-71c7049315ae
|
||||||
|
16:51:22.3N code=200 x-instance-id: 534c1846-b123-481b-a9c4-71c7049315ae
|
||||||
|
16:51:23.3N code=200 x-instance-id: 534c1846-b123-481b-a9c4-71c7049315ae
|
||||||
|
16:51:24.3N code=200 x-instance-id: 534c1846-b123-481b-a9c4-71c7049315ae
|
||||||
|
16:51:24.3N code=200 x-instance-id: 534c1846-b123-481b-a9c4-71c7049315ae
|
||||||
|
16:51:25.3N code=200 x-instance-id: 534c1846-b123-481b-a9c4-71c7049315ae
|
||||||
|
16:51:25.3N code=200 x-instance-id: 534c1846-b123-481b-a9c4-71c7049315ae
|
||||||
|
|
||||||
|
Поднимаю app2 обратно
|
||||||
@@ -0,0 +1,18 @@
|
|||||||
|
python3 tests/load.py --base-url "http://localhost:8080"
|
||||||
|
{
|
||||||
|
"lab": 3,
|
||||||
|
"workload": "closed-loop POST messages; no automatic retries",
|
||||||
|
"requested_duration_seconds": 30,
|
||||||
|
"elapsed_seconds": 30.609,
|
||||||
|
"concurrency": 4,
|
||||||
|
"successful_requests": 8195,
|
||||||
|
"failed_requests": 8,
|
||||||
|
"error_ratio": 0.000975,
|
||||||
|
"successful_rps": 267.73,
|
||||||
|
"successful_latency_ms": {
|
||||||
|
"p50": 9.403,
|
||||||
|
"p95": 12.088,
|
||||||
|
"p99": 17.671
|
||||||
|
},
|
||||||
|
"note": "Latency percentiles cover successes only. Timeouts/errors are counted separately; closed-loop has coordinated omission and client overhead."
|
||||||
|
}
|
||||||
@@ -0,0 +1,17 @@
|
|||||||
|
{
|
||||||
|
"lab": 3,
|
||||||
|
"workload": "closed-loop POST messages; no automatic retries",
|
||||||
|
"requested_duration_seconds": 30,
|
||||||
|
"elapsed_seconds": 32.212,
|
||||||
|
"concurrency": 20,
|
||||||
|
"successful_requests": 7940,
|
||||||
|
"failed_requests": 60,
|
||||||
|
"error_ratio": 0.0075,
|
||||||
|
"successful_rps": 246.491,
|
||||||
|
"successful_latency_ms": {
|
||||||
|
"p50": 32.546,
|
||||||
|
"p95": 76.906,
|
||||||
|
"p99": 114.623
|
||||||
|
},
|
||||||
|
"note": "Latency percentiles cover successes only. Timeouts/errors are counted separately; closed-loop has coordinated omission and client overhead."
|
||||||
|
}
|
||||||
@@ -0,0 +1,22 @@
|
|||||||
|
=== Замер для 2 реплик ===
|
||||||
|
Лимиты: cpus=0.5, memory=512M на реплику (суммарно 1 CPU / 1 GB)
|
||||||
|
Конфигурация: app1 + app2 за Nginx
|
||||||
|
Нагрузка: make load (POST /messages, 30 сек, concurrency 4)
|
||||||
|
|
||||||
|
{
|
||||||
|
"lab": 3,
|
||||||
|
"workload": "closed-loop POST messages; no automatic retries",
|
||||||
|
"requested_duration_seconds": 30,
|
||||||
|
"elapsed_seconds": 31.155,
|
||||||
|
"concurrency": 4,
|
||||||
|
"successful_requests": 8156,
|
||||||
|
"failed_requests": 3,
|
||||||
|
"error_ratio": 0.000368,
|
||||||
|
"successful_rps": 261.789,
|
||||||
|
"successful_latency_ms": {
|
||||||
|
"p50": 8.613,
|
||||||
|
"p95": 36.591,
|
||||||
|
"p99": 48.722
|
||||||
|
},
|
||||||
|
"note": "Latency percentiles cover successes only. Timeouts/errors are counted separately; closed-loop has coordinated omission and client overhead."
|
||||||
|
}
|
||||||
@@ -0,0 +1,17 @@
|
|||||||
|
{
|
||||||
|
"lab": 3,
|
||||||
|
"workload": "closed-loop POST messages; no automatic retries",
|
||||||
|
"requested_duration_seconds": 30,
|
||||||
|
"elapsed_seconds": 33.193,
|
||||||
|
"concurrency": 20,
|
||||||
|
"successful_requests": 8386,
|
||||||
|
"failed_requests": 60,
|
||||||
|
"error_ratio": 0.007104,
|
||||||
|
"successful_rps": 252.642,
|
||||||
|
"successful_latency_ms": {
|
||||||
|
"p50": 18.858,
|
||||||
|
"p95": 78.217,
|
||||||
|
"p99": 156.447
|
||||||
|
},
|
||||||
|
"note": "Latency percentiles cover successes only. Timeouts/errors are counted separately; closed-loop has coordinated omission and client overhead."
|
||||||
|
}
|
||||||
@@ -0,0 +1,17 @@
|
|||||||
|
{
|
||||||
|
"lab": 3,
|
||||||
|
"workload": "closed-loop POST messages; no automatic retries",
|
||||||
|
"requested_duration_seconds": 30,
|
||||||
|
"elapsed_seconds": 31.089,
|
||||||
|
"concurrency": 4,
|
||||||
|
"successful_requests": 8190,
|
||||||
|
"failed_requests": 12,
|
||||||
|
"error_ratio": 0.001463,
|
||||||
|
"successful_rps": 263.441,
|
||||||
|
"successful_latency_ms": {
|
||||||
|
"p50": 7.843,
|
||||||
|
"p95": 11.567,
|
||||||
|
"p99": 16.163
|
||||||
|
},
|
||||||
|
"note": "Latency percentiles cover successes only. Timeouts/errors are counted separately; closed-loop has coordinated omission and client overhead."
|
||||||
|
}
|
||||||
@@ -0,0 +1,17 @@
|
|||||||
|
{
|
||||||
|
"lab": 3,
|
||||||
|
"workload": "closed-loop POST messages; no automatic retries",
|
||||||
|
"requested_duration_seconds": 30,
|
||||||
|
"elapsed_seconds": 32.952,
|
||||||
|
"concurrency": 20,
|
||||||
|
"successful_requests": 8299,
|
||||||
|
"failed_requests": 20,
|
||||||
|
"error_ratio": 0.002404,
|
||||||
|
"successful_rps": 251.855,
|
||||||
|
"successful_latency_ms": {
|
||||||
|
"p50": 9.001,
|
||||||
|
"p95": 274.971,
|
||||||
|
"p99": 389.683
|
||||||
|
},
|
||||||
|
"note": "Latency percentiles cover successes only. Timeouts/errors are counted separately; closed-loop has coordinated omission and client overhead."
|
||||||
|
}
|
||||||
@@ -0,0 +1,18 @@
|
|||||||
|
python3 tests/load.py --base-url "http://localhost:8080"
|
||||||
|
{
|
||||||
|
"lab": 3,
|
||||||
|
"workload": "closed-loop POST messages; no automatic retries",
|
||||||
|
"requested_duration_seconds": 30,
|
||||||
|
"elapsed_seconds": 30.999,
|
||||||
|
"concurrency": 4,
|
||||||
|
"successful_requests": 8165,
|
||||||
|
"failed_requests": 12,
|
||||||
|
"error_ratio": 0.001468,
|
||||||
|
"successful_rps": 263.396,
|
||||||
|
"successful_latency_ms": {
|
||||||
|
"p50": 7.054,
|
||||||
|
"p95": 11.933,
|
||||||
|
"p99": 23.37
|
||||||
|
},
|
||||||
|
"note": "Latency percentiles cover successes only. Timeouts/errors are counted separately; closed-loop has coordinated omission and client overhead."
|
||||||
|
}
|
||||||
@@ -0,0 +1,18 @@
|
|||||||
|
python3 tests/load.py --base-url "http://localhost:8080"
|
||||||
|
{
|
||||||
|
"lab": 3,
|
||||||
|
"workload": "closed-loop POST messages; no automatic retries",
|
||||||
|
"requested_duration_seconds": 30,
|
||||||
|
"elapsed_seconds": 32.012,
|
||||||
|
"concurrency": 4,
|
||||||
|
"successful_requests": 8160,
|
||||||
|
"failed_requests": 2,
|
||||||
|
"error_ratio": 0.000245,
|
||||||
|
"successful_rps": 254.903,
|
||||||
|
"successful_latency_ms": {
|
||||||
|
"p50": 6.556,
|
||||||
|
"p95": 53.415,
|
||||||
|
"p99": 69.04
|
||||||
|
},
|
||||||
|
"note": "Latency percentiles cover successes only. Timeouts/errors are counted separately; closed-loop has coordinated omission and client overhead."
|
||||||
|
}
|
||||||
@@ -0,0 +1,32 @@
|
|||||||
|
./scripts/rolling-load.sh
|
||||||
|
Нагрузка: 30 запросов с интервалом 0.5 сек
|
||||||
|
16:51:30 code=200 instance=534c1846-b123-481b-a9c4-71c7049315ae
|
||||||
|
16:51:30 code=200 instance=0a6121d9-07cc-4491-9937-e8b68e5156c5
|
||||||
|
16:51:31 code=200 instance=0a6121d9-07cc-4491-9937-e8b68e5156c5
|
||||||
|
16:51:33 code=200 instance=0a6121d9-07cc-4491-9937-e8b68e5156c5
|
||||||
|
16:51:34 code=200 instance=06026485-762d-4e6a-a368-e1bac311a756
|
||||||
|
16:51:35 code=200 instance=0a6121d9-07cc-4491-9937-e8b68e5156c5
|
||||||
|
16:51:35 code=200 instance=06026485-762d-4e6a-a368-e1bac311a756
|
||||||
|
16:51:36 code=200 instance=0a6121d9-07cc-4491-9937-e8b68e5156c5
|
||||||
|
16:51:36 code=200 instance=06026485-762d-4e6a-a368-e1bac311a756
|
||||||
|
16:51:37 code=200 instance=0a6121d9-07cc-4491-9937-e8b68e5156c5
|
||||||
|
16:51:37 code=200 instance=06026485-762d-4e6a-a368-e1bac311a756
|
||||||
|
16:51:38 code=200 instance=0a6121d9-07cc-4491-9937-e8b68e5156c5
|
||||||
|
16:51:38 code=200 instance=06026485-762d-4e6a-a368-e1bac311a756
|
||||||
|
16:51:39 code=200 instance=06026485-762d-4e6a-a368-e1bac311a756
|
||||||
|
16:51:40 code=200 instance=06026485-762d-4e6a-a368-e1bac311a756
|
||||||
|
16:51:41 code=200 instance=86e75a44-8448-4aec-99c1-a2d9378f0dc2
|
||||||
|
16:51:41 code=200 instance=06026485-762d-4e6a-a368-e1bac311a756
|
||||||
|
16:51:42 code=200 instance=86e75a44-8448-4aec-99c1-a2d9378f0dc2
|
||||||
|
16:51:43 code=200 instance=06026485-762d-4e6a-a368-e1bac311a756
|
||||||
|
16:51:43 code=200 instance=86e75a44-8448-4aec-99c1-a2d9378f0dc2
|
||||||
|
16:51:44 code=200 instance=06026485-762d-4e6a-a368-e1bac311a756
|
||||||
|
16:51:44 code=200 instance=86e75a44-8448-4aec-99c1-a2d9378f0dc2
|
||||||
|
16:51:45 code=200 instance=06026485-762d-4e6a-a368-e1bac311a756
|
||||||
|
16:51:45 code=200 instance=86e75a44-8448-4aec-99c1-a2d9378f0dc2
|
||||||
|
16:51:46 code=200 instance=06026485-762d-4e6a-a368-e1bac311a756
|
||||||
|
16:51:46 code=200 instance=86e75a44-8448-4aec-99c1-a2d9378f0dc2
|
||||||
|
16:51:47 code=200 instance=06026485-762d-4e6a-a368-e1bac311a756
|
||||||
|
16:51:47 code=200 instance=86e75a44-8448-4aec-99c1-a2d9378f0dc2
|
||||||
|
16:51:48 code=200 instance=06026485-762d-4e6a-a368-e1bac311a756
|
||||||
|
16:51:49 code=200 instance=86e75a44-8448-4aec-99c1-a2d9378f0dc2
|
||||||
@@ -0,0 +1,159 @@
|
|||||||
|
./scripts/rolling-update.sh
|
||||||
|
Rolling update: app1
|
||||||
|
Container mtusi2026lab3-app1-1 Stopping
|
||||||
|
Container mtusi2026lab3-app1-1 Stopped
|
||||||
|
#0 building with "desktop-linux" instance using docker driver
|
||||||
|
|
||||||
|
#1 [app1 internal] load build definition from Dockerfile
|
||||||
|
#1 transferring dockerfile: 685B done
|
||||||
|
#1 DONE 0.0s
|
||||||
|
|
||||||
|
#2 [app1 internal] load metadata for docker.io/library/python:3.13-slim
|
||||||
|
#2 DONE 1.8s
|
||||||
|
|
||||||
|
#3 [app1 internal] load .dockerignore
|
||||||
|
#3 transferring context: 279B done
|
||||||
|
#3 DONE 0.0s
|
||||||
|
|
||||||
|
#4 [app1 1/9] FROM docker.io/library/python:3.13-slim@sha256:09a17cad02668ae61ece136b4fd36ac3849e14f670ebedb637ea3e15580525bc
|
||||||
|
#4 DONE 0.0s
|
||||||
|
|
||||||
|
#5 [app1 internal] load build context
|
||||||
|
#5 transferring context: 4.73kB done
|
||||||
|
#5 DONE 0.0s
|
||||||
|
|
||||||
|
#6 [app1 4/9] RUN pip install --no-cache-dir -r requirements-dev.txt
|
||||||
|
#6 CACHED
|
||||||
|
|
||||||
|
#7 [app1 3/9] COPY requirements-dev.txt .
|
||||||
|
#7 CACHED
|
||||||
|
|
||||||
|
#8 [app1 2/9] WORKDIR /app
|
||||||
|
#8 CACHED
|
||||||
|
|
||||||
|
#9 [app1 8/9] COPY alembic/ alembic/
|
||||||
|
#9 CACHED
|
||||||
|
|
||||||
|
#10 [app1 6/9] COPY app/ app/
|
||||||
|
#10 CACHED
|
||||||
|
|
||||||
|
#11 [app1 7/9] COPY alembic.ini .
|
||||||
|
#11 CACHED
|
||||||
|
|
||||||
|
#12 [app1 5/9] RUN useradd --create-home --shell /bin/bash appuser
|
||||||
|
#12 CACHED
|
||||||
|
|
||||||
|
#13 [app1 9/9] RUN chown -R appuser:appuser /app/alembic
|
||||||
|
#13 CACHED
|
||||||
|
|
||||||
|
#14 [app1] exporting to image
|
||||||
|
#14 exporting layers done
|
||||||
|
#14 writing image sha256:af1621af7e8af7324cc026feef618c950fa872eeb17c4333dade10b720a57503 done
|
||||||
|
#14 naming to docker.io/library/mtusi2026lab3-app1 done
|
||||||
|
#14 DONE 0.0s
|
||||||
|
|
||||||
|
#15 [app1] resolving provenance for metadata file
|
||||||
|
#15 DONE 0.0s
|
||||||
|
Container mtusi_messenger_redis Running
|
||||||
|
Container mtusi_messenger_db Running
|
||||||
|
Container mtusi2026lab3-app1-1 Created
|
||||||
|
Container mtusi_messenger_redis Waiting
|
||||||
|
Container mtusi_messenger_db Waiting
|
||||||
|
Container mtusi_messenger_redis Healthy
|
||||||
|
Container mtusi_messenger_db Healthy
|
||||||
|
Container mtusi2026lab3-app1-1 Starting
|
||||||
|
Container mtusi2026lab3-app1-1 Started
|
||||||
|
Жду, пока app1 станет healthy...
|
||||||
|
|
||||||
|
Rolling update: app2
|
||||||
|
Container mtusi2026lab3-app2-1 Stopping
|
||||||
|
Container mtusi2026lab3-app2-1 Stopped
|
||||||
|
#0 building with "desktop-linux" instance using docker driver
|
||||||
|
|
||||||
|
#1 [app2 internal] load build definition from Dockerfile
|
||||||
|
#1 transferring dockerfile: 685B done
|
||||||
|
#1 DONE 0.0s
|
||||||
|
|
||||||
|
#2 [app2 internal] load metadata for docker.io/library/python:3.13-slim
|
||||||
|
#2 DONE 0.3s
|
||||||
|
|
||||||
|
#3 [app2 internal] load .dockerignore
|
||||||
|
#3 transferring context: 279B done
|
||||||
|
#3 DONE 0.0s
|
||||||
|
|
||||||
|
#4 [app2 1/9] FROM docker.io/library/python:3.13-slim@sha256:09a17cad02668ae61ece136b4fd36ac3849e14f670ebedb637ea3e15580525bc
|
||||||
|
#4 DONE 0.0s
|
||||||
|
|
||||||
|
#5 [app2 internal] load build context
|
||||||
|
#5 transferring context: 4.73kB done
|
||||||
|
#5 DONE 0.0s
|
||||||
|
|
||||||
|
#6 [app2 3/9] COPY requirements-dev.txt .
|
||||||
|
#6 CACHED
|
||||||
|
|
||||||
|
#7 [app2 7/9] COPY alembic.ini .
|
||||||
|
#7 CACHED
|
||||||
|
|
||||||
|
#8 [app2 8/9] COPY alembic/ alembic/
|
||||||
|
#8 CACHED
|
||||||
|
|
||||||
|
#9 [app2 5/9] RUN useradd --create-home --shell /bin/bash appuser
|
||||||
|
#9 CACHED
|
||||||
|
|
||||||
|
#10 [app2 2/9] WORKDIR /app
|
||||||
|
#10 CACHED
|
||||||
|
|
||||||
|
#11 [app2 4/9] RUN pip install --no-cache-dir -r requirements-dev.txt
|
||||||
|
#11 CACHED
|
||||||
|
|
||||||
|
#12 [app2 6/9] COPY app/ app/
|
||||||
|
#12 CACHED
|
||||||
|
|
||||||
|
#13 [app2 9/9] RUN chown -R appuser:appuser /app/alembic
|
||||||
|
#13 CACHED
|
||||||
|
|
||||||
|
#14 [app2] exporting to image
|
||||||
|
#14 exporting layers done
|
||||||
|
#14 writing image sha256:9c5ffbef790bf603d2cd9d54e18df8b05aa9541f5201974646cfd5fb1d46720b done
|
||||||
|
#14 naming to docker.io/library/mtusi2026lab3-app2 done
|
||||||
|
#14 DONE 0.0s
|
||||||
|
|
||||||
|
#15 [app2] resolving provenance for metadata file
|
||||||
|
#15 DONE 0.0s
|
||||||
|
Container mtusi_messenger_redis Running
|
||||||
|
Container mtusi_messenger_db Running
|
||||||
|
Container mtusi2026lab3-app2-1 Created
|
||||||
|
Container mtusi_messenger_redis Waiting
|
||||||
|
Container mtusi_messenger_db Waiting
|
||||||
|
Container mtusi_messenger_db Healthy
|
||||||
|
Container mtusi_messenger_redis Healthy
|
||||||
|
Container mtusi2026lab3-app2-1 Starting
|
||||||
|
Container mtusi2026lab3-app2-1 Started
|
||||||
|
Жду, пока app2 станет healthy...
|
||||||
|
|
||||||
|
Проверка: обе реплики живы
|
||||||
|
% Total % Received % Xferd Average Speed Time Time Time Current
|
||||||
|
Dload Upload Total Spent Left Speed
|
||||||
|
␍ 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0␍100 15 100 15 0 0 2824 0 --:--:-- --:--:-- --:--:-- 3000
|
||||||
|
HTTP/1.1 200 OK
|
||||||
|
Server: nginx/1.29.4
|
||||||
|
Date: Fri, 06 Nov 2026 13:51:44 GMT
|
||||||
|
Content-Type: application/json
|
||||||
|
Content-Length: 15
|
||||||
|
Connection: keep-alive
|
||||||
|
x-instance-id: 06026485-762d-4e6a-a368-e1bac311a756
|
||||||
|
x-request-id: 9fd1f3e6-0c5a-4cce-a727-35467ef553b8
|
||||||
|
|
||||||
|
{"status":"ok"} % Total % Received % Xferd Average Speed Time Time Time Current
|
||||||
|
Dload Upload Total Spent Left Speed
|
||||||
|
␍ 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0␍100 15 100 15 0 0 3764 0 --:--:-- --:--:-- --:--:-- 5000
|
||||||
|
HTTP/1.1 200 OK
|
||||||
|
Server: nginx/1.29.4
|
||||||
|
Date: Fri, 06 Nov 2026 13:51:44 GMT
|
||||||
|
Content-Type: application/json
|
||||||
|
Content-Length: 15
|
||||||
|
Connection: keep-alive
|
||||||
|
x-instance-id: 86e75a44-8448-4aec-99c1-a2d9378f0dc2
|
||||||
|
x-request-id: 23fcdcf5-8f9c-48f3-8973-4c5a49186e23
|
||||||
|
|
||||||
|
{"status":"ok"}
|
||||||
Binary file not shown.
|
After Width: | Height: | Size: 130 KiB |
@@ -0,0 +1,10 @@
|
|||||||
|
HTTP/1.1 200 OK
|
||||||
|
Server: nginx/1.29.4
|
||||||
|
Date: Sat, 31 Oct 2026 14:20:31 GMT
|
||||||
|
Content-Type: application/json
|
||||||
|
Content-Length: 133
|
||||||
|
Connection: keep-alive
|
||||||
|
x-instance-id: 0bde7749-b376-47a1-b6b5-d6996cc8f451
|
||||||
|
x-request-id: b58b0c54-8f13-48ba-a469-b63f3bdd62f5
|
||||||
|
|
||||||
|
{"id":"75ff0b0b-2cc0-43cf-af38-a50ff2968506","username":"lbtest","display_name":"LB Test","created_at":"2026-10-31T14:06:35.944873Z"}
|
||||||
@@ -0,0 +1,10 @@
|
|||||||
|
HTTP/1.1 200 OK
|
||||||
|
Server: nginx/1.29.4
|
||||||
|
Date: Sat, 31 Oct 2026 14:20:31 GMT
|
||||||
|
Content-Type: application/json
|
||||||
|
Content-Length: 133
|
||||||
|
Connection: keep-alive
|
||||||
|
x-instance-id: fd34912d-faf5-44cf-bb1c-5a6b6ab368dd
|
||||||
|
x-request-id: c4499fdd-21c8-4b60-90be-e47e079ede18
|
||||||
|
|
||||||
|
{"id":"75ff0b0b-2cc0-43cf-af38-a50ff2968506","username":"lbtest","display_name":"LB Test","created_at":"2026-10-31T14:06:35.944873Z"}
|
||||||
@@ -0,0 +1,10 @@
|
|||||||
|
HTTP/1.1 200 OK
|
||||||
|
Server: nginx/1.29.4
|
||||||
|
Date: Sat, 31 Oct 2026 14:20:31 GMT
|
||||||
|
Content-Type: application/json
|
||||||
|
Content-Length: 133
|
||||||
|
Connection: keep-alive
|
||||||
|
x-instance-id: 0bde7749-b376-47a1-b6b5-d6996cc8f451
|
||||||
|
x-request-id: 40834f73-64c3-40de-adfe-049ecc07a4d4
|
||||||
|
|
||||||
|
{"id":"75ff0b0b-2cc0-43cf-af38-a50ff2968506","username":"lbtest","display_name":"LB Test","created_at":"2026-10-31T14:06:35.944873Z"}
|
||||||
@@ -0,0 +1,10 @@
|
|||||||
|
HTTP/1.1 200 OK
|
||||||
|
Server: nginx/1.29.4
|
||||||
|
Date: Sat, 31 Oct 2026 14:20:31 GMT
|
||||||
|
Content-Type: application/json
|
||||||
|
Content-Length: 133
|
||||||
|
Connection: keep-alive
|
||||||
|
x-instance-id: fd34912d-faf5-44cf-bb1c-5a6b6ab368dd
|
||||||
|
x-request-id: 3a53c323-e47a-4eb4-8321-bd289f81d751
|
||||||
|
|
||||||
|
{"id":"75ff0b0b-2cc0-43cf-af38-a50ff2968506","username":"lbtest","display_name":"LB Test","created_at":"2026-10-31T14:06:35.944873Z"}
|
||||||
@@ -0,0 +1,12 @@
|
|||||||
|
python3 -m pytest tests/test_resilience.py -v
|
||||||
|
============================= test session starts ==============================
|
||||||
|
platform darwin -- Python 3.13.2, pytest-8.3.4, pluggy-1.6.0 -- /Users/kirill/Downloads/drone_simulation_project/.venv/bin/python3
|
||||||
|
cachedir: .pytest_cache
|
||||||
|
rootdir: /Users/kirill/Desktop/esp/temka/mtusi2026lab3
|
||||||
|
plugins: platformdirs-4.12.2, anyio-3.6.2
|
||||||
|
collecting ... collected 2 items
|
||||||
|
|
||||||
|
tests/test_resilience.py::test_postgres_down_returns_503 PASSED [ 50%]
|
||||||
|
tests/test_resilience.py::test_redis_down_returns_500_json PASSED [100%]
|
||||||
|
|
||||||
|
============================== 2 passed in 6.84s ===============================
|
||||||
@@ -0,0 +1,13 @@
|
|||||||
|
python3 -m pytest tests/test_lab3.py -v
|
||||||
|
============================= test session starts ==============================
|
||||||
|
platform darwin -- Python 3.13.2, pytest-8.3.4, pluggy-1.6.0 -- /Users/kirill/Downloads/drone_simulation_project/.venv/bin/python3
|
||||||
|
cachedir: .pytest_cache
|
||||||
|
rootdir: /Users/kirill/Desktop/esp/temka/mtusi2026lab3
|
||||||
|
plugins: platformdirs-4.12.2, anyio-3.6.2
|
||||||
|
collecting ... collected 3 items
|
||||||
|
|
||||||
|
tests/test_lab3.py::test_idempotency_same_body_returns_same_id PASSED [ 33%]
|
||||||
|
tests/test_lab3.py::test_idempotency_different_body_returns_409 PASSED [ 66%]
|
||||||
|
tests/test_lab3.py::test_shared_session_across_replicas PASSED [100%]
|
||||||
|
|
||||||
|
============================== 3 passed in 1.50s ===============================
|
||||||
@@ -0,0 +1,26 @@
|
|||||||
|
events { worker_connections 1024; }
|
||||||
|
|
||||||
|
http {
|
||||||
|
upstream api_backend {
|
||||||
|
least_conn;
|
||||||
|
server app1:8080 max_fails=2 fail_timeout=5s;
|
||||||
|
server app2:8080 max_fails=2 fail_timeout=5s;
|
||||||
|
}
|
||||||
|
|
||||||
|
server {
|
||||||
|
listen 80;
|
||||||
|
|
||||||
|
location / {
|
||||||
|
proxy_pass http://api_backend;
|
||||||
|
proxy_set_header Host $host;
|
||||||
|
proxy_set_header X-Real-IP $remote_addr;
|
||||||
|
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||||
|
proxy_next_upstream error timeout http_502 http_503 http_504;
|
||||||
|
|
||||||
|
proxy_connect_timeout 2s;
|
||||||
|
proxy_send_timeout 5s;
|
||||||
|
proxy_read_timeout 5s;
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,2 +1,13 @@
|
|||||||
# Only for full OpenAPI/JSON Schema validation; HTTP tests use stdlib.
|
# Only for full OpenAPI/JSON Schema validation; HTTP tests use stdlib.
|
||||||
openapi-spec-validator==0.7.2
|
openapi-spec-validator==0.7.2
|
||||||
|
pytest==8.3.4
|
||||||
|
fastapi==0.115.0
|
||||||
|
uvicorn[standard]==0.52.4
|
||||||
|
pydantic==2.13.5
|
||||||
|
asyncpg==0.31.0
|
||||||
|
sqlalchemy[asyncio]==2.1.0
|
||||||
|
redis==6.2.0
|
||||||
|
passlib==1.7.4
|
||||||
|
bcrypt==4.1.2
|
||||||
|
alembic==1.14.0
|
||||||
|
psycopg2-binary
|
||||||
|
|||||||
@@ -0,0 +1,14 @@
|
|||||||
|
from pydantic import BaseModel, Field, field_validator, ConfigDict
|
||||||
|
|
||||||
|
|
||||||
|
class CreateChat(BaseModel):
|
||||||
|
model_config = ConfigDict(extra="forbid")
|
||||||
|
title: str = Field(min_length=1, max_length=100)
|
||||||
|
member_ids: list[str] = Field(min_length=1, max_length=100)
|
||||||
|
|
||||||
|
@field_validator("member_ids")
|
||||||
|
@classmethod
|
||||||
|
def unique_members(cls, v):
|
||||||
|
if len(set(v)) != len(v):
|
||||||
|
raise ValueError("member_ids должны быть уникальными")
|
||||||
|
return v
|
||||||
@@ -0,0 +1,6 @@
|
|||||||
|
from pydantic import BaseModel, Field, ConfigDict
|
||||||
|
|
||||||
|
|
||||||
|
class CreateMessage(BaseModel):
|
||||||
|
model_config = ConfigDict(extra="forbid")
|
||||||
|
text: str = Field(min_length=1, max_length=4000)
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
from pydantic import BaseModel, Field, ConfigDict
|
||||||
|
|
||||||
|
|
||||||
|
class CreateUser(BaseModel):
|
||||||
|
model_config = ConfigDict(extra="forbid")
|
||||||
|
username: str = Field(pattern=r"^[a-z0-9_]{3,32}$")
|
||||||
|
display_name: str = Field(min_length=1, max_length=100)
|
||||||
Executable
+21
@@ -0,0 +1,21 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
REPLICA="${1:-app1}"
|
||||||
|
|
||||||
|
echo "Останавливаю $REPLICA"
|
||||||
|
date +"%H:%M:%S.%3N"
|
||||||
|
./scripts/stop-one.sh "$REPLICA"
|
||||||
|
|
||||||
|
echo ""
|
||||||
|
echo "Шлю запросы каждые 0.5 сек, смотрю код и x-instance-id"
|
||||||
|
for i in {1..20}; do
|
||||||
|
TS=$(date +"%H:%M:%S.%3N")
|
||||||
|
CODE=$(curl -s -o /dev/null -w "%{http_code}" http://localhost:8080/health/live)
|
||||||
|
INST=$(curl -s -i http://localhost:8080/health/live | grep -i "^x-instance-id:" | tr -d '\r')
|
||||||
|
echo "$TS code=$CODE $INST"
|
||||||
|
sleep 0.5
|
||||||
|
done
|
||||||
|
|
||||||
|
echo ""
|
||||||
|
echo "Поднимаю $REPLICA обратно"
|
||||||
|
docker compose start "$REPLICA"
|
||||||
@@ -0,0 +1,23 @@
|
|||||||
|
import matplotlib.pyplot as plt
|
||||||
|
import os
|
||||||
|
|
||||||
|
replicas = [1, 2, 4, 6]
|
||||||
|
rps = [250, 255, 260, 257]
|
||||||
|
|
||||||
|
plt.figure(figsize=(8, 5))
|
||||||
|
plt.plot(replicas, rps, marker='o', linestyle='-', color='b', linewidth=2, markersize=8)
|
||||||
|
|
||||||
|
plt.title('Трек 1: Масштабирование API (суммарно 2 CPU / 1 GB)', fontsize=14)
|
||||||
|
plt.xlabel('Количество API-реплик', fontsize=12)
|
||||||
|
plt.ylabel('RPS (запросов в секунду)', fontsize=12)
|
||||||
|
|
||||||
|
plt.grid(True, linestyle='--', alpha=0.7)
|
||||||
|
plt.xticks(replicas)
|
||||||
|
|
||||||
|
plt.annotate('Saturation Point\n(Оптимум)', xy=(4, 260), xytext=(3, 252),
|
||||||
|
arrowprops=dict(facecolor='red', shrink=0.05),
|
||||||
|
fontsize=10, color='red')
|
||||||
|
|
||||||
|
os.makedirs('evidence', exist_ok=True)
|
||||||
|
plt.savefig('evidence/scaling.png', dpi=300, bbox_inches='tight')
|
||||||
|
print("График сохранен в evidence/scaling.png")
|
||||||
Executable
+13
@@ -0,0 +1,13 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
echo "Нагрузка: 30 запросов с интервалом 0.5 сек"
|
||||||
|
for i in {1..30}; do
|
||||||
|
TS=$(date +"%H:%M:%S")
|
||||||
|
|
||||||
|
RESP=$(curl -s -i http://localhost:8080/health/live)
|
||||||
|
CODE=$(echo "$RESP" | head -1 | awk '{print $2}')
|
||||||
|
INST=$(echo "$RESP" | grep -i "^x-instance-id:" | tr -d '\r' | awk '{print $2}')
|
||||||
|
|
||||||
|
echo "$TS code=$CODE instance=${INST:-<нет>}"
|
||||||
|
sleep 0.5
|
||||||
|
done
|
||||||
Executable
+21
@@ -0,0 +1,21 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
set -e
|
||||||
|
|
||||||
|
echo "Rolling update: app1"
|
||||||
|
docker compose stop app1
|
||||||
|
docker compose up -d --build app1
|
||||||
|
echo "Жду, пока app1 станет healthy..."
|
||||||
|
sleep 5
|
||||||
|
|
||||||
|
echo ""
|
||||||
|
echo "Rolling update: app2"
|
||||||
|
docker compose stop app2
|
||||||
|
docker compose up -d --build app2
|
||||||
|
echo "Жду, пока app2 станет healthy..."
|
||||||
|
sleep 5
|
||||||
|
|
||||||
|
echo ""
|
||||||
|
echo "Проверка: обе реплики живы"
|
||||||
|
curl -i http://localhost:8080/health/live
|
||||||
|
curl -i http://localhost:8080/health/live
|
||||||
Executable
+12
@@ -0,0 +1,12 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
REPLICA="${1:-app1}"
|
||||||
|
|
||||||
|
if [ "$REPLICA" != "app1" ] && [ "$REPLICA" != "app2" ]; then
|
||||||
|
echo "Ошибка: укажи app1 или app2" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "Останавливаю $REPLICA..."
|
||||||
|
docker compose stop "$REPLICA"
|
||||||
|
echo "$REPLICA остановлен"
|
||||||
@@ -0,0 +1,81 @@
|
|||||||
|
import uuid
|
||||||
|
import requests
|
||||||
|
|
||||||
|
BASE_URL = "http://localhost:8080"
|
||||||
|
|
||||||
|
|
||||||
|
def register_and_login(username, password="valid_password_123"):
|
||||||
|
requests.post(f"{BASE_URL}/api/v1/users", json={
|
||||||
|
"username": username,
|
||||||
|
"display_name": "Test",
|
||||||
|
"password": password,
|
||||||
|
})
|
||||||
|
resp = requests.post(f"{BASE_URL}/api/v1/auth/sessions", auth=(username, password))
|
||||||
|
assert resp.status_code == 201, f"Логин не удался: {resp.text}"
|
||||||
|
return resp.json()["token"]
|
||||||
|
|
||||||
|
|
||||||
|
def create_chat(token):
|
||||||
|
headers = {"Authorization": f"Bearer {token}"}
|
||||||
|
me = requests.get(f"{BASE_URL}/api/v1/users/me", headers=headers).json()
|
||||||
|
resp = requests.post(f"{BASE_URL}/api/v1/chats", headers=headers, json={
|
||||||
|
"title": "Test Chat",
|
||||||
|
"member_ids": [me["id"]],
|
||||||
|
})
|
||||||
|
assert resp.status_code == 201, f"Чат не создан: {resp.text}"
|
||||||
|
return resp.json()["id"]
|
||||||
|
|
||||||
|
|
||||||
|
def test_idempotency_same_body_returns_same_id():
|
||||||
|
token = register_and_login("test_idem_same")
|
||||||
|
chat_id = create_chat(token)
|
||||||
|
key = str(uuid.uuid4())
|
||||||
|
headers = {
|
||||||
|
"Authorization": f"Bearer {token}",
|
||||||
|
"Idempotency-Key": key,
|
||||||
|
"Content-Type": "application/json",
|
||||||
|
}
|
||||||
|
body = {"text": "Hello"}
|
||||||
|
|
||||||
|
r1 = requests.post(f"{BASE_URL}/api/v1/chats/{chat_id}/messages", headers=headers, json=body)
|
||||||
|
r2 = requests.post(f"{BASE_URL}/api/v1/chats/{chat_id}/messages", headers=headers, json=body)
|
||||||
|
|
||||||
|
assert r1.status_code == 201, f"Первый запрос: {r1.status_code}"
|
||||||
|
assert r2.status_code == 201, f"Повтор: {r2.status_code}"
|
||||||
|
assert r1.json()["id"] == r2.json()["id"], "Id (uuid) сообщения должен быть одинаковым"
|
||||||
|
|
||||||
|
|
||||||
|
def test_idempotency_different_body_returns_409():
|
||||||
|
token = register_and_login("test_idem_diff")
|
||||||
|
chat_id = create_chat(token)
|
||||||
|
key = str(uuid.uuid4())
|
||||||
|
headers = {
|
||||||
|
"Authorization": f"Bearer {token}",
|
||||||
|
"Idempotency-Key": key,
|
||||||
|
"Content-Type": "application/json",
|
||||||
|
}
|
||||||
|
|
||||||
|
r1 = requests.post(f"{BASE_URL}/api/v1/chats/{chat_id}/messages",
|
||||||
|
headers=headers, json={"text": "First"})
|
||||||
|
assert r1.status_code == 201
|
||||||
|
|
||||||
|
r2 = requests.post(f"{BASE_URL}/api/v1/chats/{chat_id}/messages",
|
||||||
|
headers=headers, json={"text": "Second"})
|
||||||
|
assert r2.status_code == 409, f"Ожидался 409, получен {r2.status_code}"
|
||||||
|
assert r2.json()["error"]["code"] == "conflict"
|
||||||
|
|
||||||
|
|
||||||
|
def test_shared_session_across_replicas():
|
||||||
|
token = register_and_login("test_shared_session")
|
||||||
|
headers = {"Authorization": f"Bearer {token}"}
|
||||||
|
|
||||||
|
instance_ids = set()
|
||||||
|
for _ in range(10):
|
||||||
|
resp = requests.get(f"{BASE_URL}/api/v1/users/me", headers=headers)
|
||||||
|
assert resp.status_code == 200, f"Сессия не работает: {resp.status_code}"
|
||||||
|
instance_ids.add(resp.headers.get("x-instance-id"))
|
||||||
|
|
||||||
|
assert len(instance_ids) >= 2, (
|
||||||
|
f"Ожидались ≥2 разных x-instance-id, получено: {instance_ids}. "
|
||||||
|
f"Проверь, что app1 и app2 запущены и Nginx балансирует."
|
||||||
|
)
|
||||||
@@ -0,0 +1,32 @@
|
|||||||
|
import subprocess
|
||||||
|
import time
|
||||||
|
import requests
|
||||||
|
|
||||||
|
BASE_URL = "http://localhost:8080"
|
||||||
|
|
||||||
|
|
||||||
|
def test_postgres_down_returns_503():
|
||||||
|
subprocess.run(["docker", "compose", "stop", "db"], check=True)
|
||||||
|
time.sleep(1)
|
||||||
|
|
||||||
|
try:
|
||||||
|
resp = requests.get(f"{BASE_URL}/health/ready")
|
||||||
|
assert resp.status_code == 503, f"Ожидался 503, получен {resp.status_code}"
|
||||||
|
finally:
|
||||||
|
subprocess.run(["docker", "compose", "start", "db"], check=True)
|
||||||
|
time.sleep(2)
|
||||||
|
|
||||||
|
|
||||||
|
def test_redis_down_returns_500_json():
|
||||||
|
subprocess.run(["docker", "pause", "mtusi_messenger_redis"], check=True)
|
||||||
|
|
||||||
|
try:
|
||||||
|
headers = {"Authorization": "Bearer test_token"}
|
||||||
|
resp = requests.get(f"{BASE_URL}/api/v1/users/me", headers=headers)
|
||||||
|
|
||||||
|
assert resp.status_code == 500, f"Ожидался 500, получен {resp.status_code}"
|
||||||
|
body = resp.json()
|
||||||
|
assert body["error"]["code"] == "internal_error", "Неверный код ошибки"
|
||||||
|
assert "request_id" in body["error"], "Нет request_id"
|
||||||
|
finally:
|
||||||
|
subprocess.run(["docker", "unpause", "mtusi_messenger_redis"], check=True)
|
||||||
@@ -0,0 +1,44 @@
|
|||||||
|
import pytest
|
||||||
|
import requests
|
||||||
|
import time
|
||||||
|
|
||||||
|
BASE_URL = "http://localhost:8080"
|
||||||
|
|
||||||
|
|
||||||
|
def register_and_login(username, password):
|
||||||
|
requests.post(f"{BASE_URL}/api/v1/users", json={
|
||||||
|
"username": username, "display_name": "Test", "password": password
|
||||||
|
})
|
||||||
|
|
||||||
|
resp = requests.post(f"{BASE_URL}/api/v1/auth/sessions", auth=(username, password))
|
||||||
|
return resp.json()["token"]
|
||||||
|
|
||||||
|
|
||||||
|
def test_wrong_password():
|
||||||
|
username = "test_wrong_pass"
|
||||||
|
password = "valid_password_123"
|
||||||
|
requests.post(f"{BASE_URL}/api/v1/users", json={
|
||||||
|
"username": username, "display_name": "Test", "password": password
|
||||||
|
})
|
||||||
|
|
||||||
|
resp = requests.post(f"{BASE_URL}/api/v1/auth/sessions", auth=(username, "wrong_password"))
|
||||||
|
assert resp.status_code == 401
|
||||||
|
|
||||||
|
|
||||||
|
def test_logout():
|
||||||
|
token = register_and_login("test_logout", "valid_password_123")
|
||||||
|
headers = {"Authorization": f"Bearer {token}"}
|
||||||
|
assert requests.get(f"{BASE_URL}/api/v1/users/me", headers=headers).status_code == 200
|
||||||
|
assert requests.delete(f"{BASE_URL}/api/v1/auth/sessions/current", headers=headers).status_code == 204
|
||||||
|
assert requests.get(f"{BASE_URL}/api/v1/users/me", headers=headers).status_code == 401
|
||||||
|
|
||||||
|
|
||||||
|
def test_expiry():
|
||||||
|
token = register_and_login("test_expiry", "valid_password_123")
|
||||||
|
headers = {"Authorization": f"Bearer {token}"}
|
||||||
|
|
||||||
|
assert requests.get(f"{BASE_URL}/api/v1/users/me", headers=headers).status_code == 200
|
||||||
|
|
||||||
|
time.sleep(3)
|
||||||
|
|
||||||
|
assert requests.get(f"{BASE_URL}/api/v1/users/me", headers=headers).status_code == 401
|
||||||
Reference in New Issue
Block a user