Завершить уровень 4: проверить отказы, поочерёдную замену и ограничить ожидания кэша
This commit is contained in:
@@ -11,3 +11,9 @@ SESSION_STORE=postgres
|
||||
CACHE_URL_FILE=/run/secrets/cache_url
|
||||
API_REPLICAS=2
|
||||
IDEMPOTENCY_TTL_SECONDS=86400
|
||||
|
||||
# Лимиты одной API-реплики и воспроизводимый переключатель исследования.
|
||||
API_CPUS=0.5
|
||||
API_MEMORY=256m
|
||||
POOL_SIZE=10
|
||||
OPTIMIZED_WRITES=1
|
||||
|
||||
@@ -12,5 +12,21 @@ jobs:
|
||||
python-version: '3.12'
|
||||
- run: python -m pip install -r requirements-dev.txt
|
||||
- run: make check validate PYTHON=python
|
||||
# This job validates the skeleton, not a student solution.
|
||||
# Add build, readiness and make test in a separate application job.
|
||||
application:
|
||||
runs-on: ubuntu-latest
|
||||
timeout-minutes: 15
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- uses: actions/setup-python@v5
|
||||
with:
|
||||
python-version: '3.12'
|
||||
- run: python scripts/bootstrap.py
|
||||
- run: docker compose up -d --build
|
||||
- run: python scripts/wait_ready.py --replicas 2
|
||||
- run: make test PYTHON=python
|
||||
- run: python student-tests/test_lab3.py
|
||||
- run: make test-persistence PYTHON=python ACTION_SCRIPT=scripts/restart.sh
|
||||
- run: python scripts/wait_ready.py --replicas 2
|
||||
- run: make test-failover PYTHON=python ACTION_SCRIPT=scripts/stop-one.sh
|
||||
- if: always()
|
||||
run: docker compose down
|
||||
|
||||
@@ -7,6 +7,7 @@ x-api: &api
|
||||
CACHE_URL: redis://redis:6379/0
|
||||
SESSION_TTL_SECONDS: ${SESSION_TTL_SECONDS:-3600}
|
||||
POOL_SIZE: ${POOL_SIZE:-10}
|
||||
OPTIMIZED_WRITES: ${OPTIMIZED_WRITES:-1}
|
||||
secrets: [database_url]
|
||||
depends_on:
|
||||
migrate:
|
||||
|
||||
@@ -0,0 +1,5 @@
|
||||
{
|
||||
"Name": "13th Gen Intel(R) Core(TM) i5-1340P",
|
||||
"NumberOfCores": 12,
|
||||
"NumberOfLogicalProcessors": 16
|
||||
}
|
||||
@@ -0,0 +1,12 @@
|
||||
Container lyakhonov-lab3-redis-1 Stopping
|
||||
Container lyakhonov-lab3-redis-1 Stopped
|
||||
Container lyakhonov-lab3-redis-1 Starting
|
||||
Container lyakhonov-lab3-redis-1 Started
|
||||
Container lyakhonov-lab3-db-1 Stopping
|
||||
Container lyakhonov-lab3-db-1 Stopped
|
||||
Container lyakhonov-lab3-db-1 Starting
|
||||
Container lyakhonov-lab3-db-1 Started
|
||||
PASS: API ready, replicas: 2
|
||||
PASS: Redis остановлен, действующая сессия и профиль доступны из PostgreSQL за 0.27 с
|
||||
PASS: PostgreSQL остановлен; закрытый отказ 503 за 3.037 с
|
||||
PASS: прежняя сессия сохранилась после восстановления БД
|
||||
@@ -0,0 +1 @@
|
||||
16 8126664704 "Docker Desktop"
|
||||
@@ -1,6 +1,6 @@
|
||||
{"Command":"\"python -m uvicorn s…\"","CreatedAt":"2026-10-23 18:31:24 +0300 MSK","ExitCode":0,"Health":"","ID":"c086e70205ab","Image":"lyakhonov-messenger:lab3","Labels":"com.docker.compose.project.working_dir=C:\\Users\\User\\Desktop\\vysoko-nagr 3,com.docker.compose.service=api,com.docker.compose.config-hash=93b46b7eddf2f406e22ff9739f28d29e78cf3fb8c27d6862629d64204aa83029,com.docker.compose.image=sha256:f65f532e3042a0f9f8fcd9ffbf1722aaf432e327ced9f7a9bf0562e21d4c2ac8,com.docker.compose.project=lyakhonov-lab3,desktop.docker.io/mounts/0/SourceKind=hostFile,desktop.docker.io/mounts/0/Target=/run/secrets/database_url,com.docker.compose.replace=api-1,desktop.docker.io/mounts/0/Source=C:\\Users\\User\\Desktop\\vysoko-nagr 3\\secrets\\database_url,desktop.docker.io/ports.scheme=v2,com.docker.compose.version=2.40.3,com.docker.compose.container-number=1,com.docker.compose.depends_on=migrate:service_completed_successfully:false,com.docker.compose.oneoff=False,com.docker.compose.project.config_files=C:\\Users\\User\\Desktop\\vysoko-nagr 3\\compose.yaml","LocalVolumes":"0","Mounts":"/run/desktop/m…","Name":"lyakhonov-lab3-api-1","Names":"lyakhonov-lab3-api-1","Networks":"lyakhonov-lab3_default","Ports":"","Project":"lyakhonov-lab3","Publishers":[],"RunningFor":"About a minute ago","Service":"api","Size":"0B","State":"exited","Status":"Exited (0) 13 seconds ago"}
|
||||
{"Command":"\"python -m uvicorn s…\"","CreatedAt":"2026-10-23 18:31:24 +0300 MSK","ExitCode":0,"Health":"healthy","ID":"1522443443f2","Image":"lyakhonov-messenger:lab3","Labels":"com.docker.compose.version=2.40.3,desktop.docker.io/mounts/0/Source=C:\\Users\\User\\Desktop\\vysoko-nagr 3\\secrets\\database_url,desktop.docker.io/mounts/0/SourceKind=hostFile,desktop.docker.io/mounts/0/Target=/run/secrets/database_url,desktop.docker.io/ports.scheme=v2,com.docker.compose.container-number=2,com.docker.compose.image=sha256:f65f532e3042a0f9f8fcd9ffbf1722aaf432e327ced9f7a9bf0562e21d4c2ac8,com.docker.compose.oneoff=False,com.docker.compose.project=lyakhonov-lab3,com.docker.compose.replace=api-2,com.docker.compose.config-hash=93b46b7eddf2f406e22ff9739f28d29e78cf3fb8c27d6862629d64204aa83029,com.docker.compose.service=api,com.docker.compose.depends_on=migrate:service_completed_successfully:false,com.docker.compose.project.config_files=C:\\Users\\User\\Desktop\\vysoko-nagr 3\\compose.yaml,com.docker.compose.project.working_dir=C:\\Users\\User\\Desktop\\vysoko-nagr 3","LocalVolumes":"0","Mounts":"/run/desktop/m…","Name":"lyakhonov-lab3-api-2","Names":"lyakhonov-lab3-api-2","Networks":"lyakhonov-lab3_default","Ports":"8080/tcp","Project":"lyakhonov-lab3","Publishers":[{"URL":"","TargetPort":8080,"PublishedPort":0,"Protocol":"tcp"}],"RunningFor":"About a minute ago","Service":"api","Size":"0B","State":"running","Status":"Up 22 seconds (healthy)"}
|
||||
{"Command":"\"docker-entrypoint.s…\"","CreatedAt":"2026-10-23 18:29:58 +0300 MSK","ExitCode":0,"Health":"healthy","ID":"f2cdcc232751","Image":"postgres:16.6-alpine","Labels":"com.docker.compose.version=2.40.3,desktop.docker.io/mounts/0/Source=C:\\Users\\User\\Desktop\\vysoko-nagr 3\\secrets\\db_password,com.docker.compose.config-hash=fa2b9ebefd39686b3404aa264a806204d268522150797263203427d945e51cd6,com.docker.compose.container-number=1,com.docker.compose.project=lyakhonov-lab3,desktop.docker.io/mounts/0/SourceKind=hostFile,desktop.docker.io/mounts/0/Target=/run/secrets/db_password,desktop.docker.io/ports.scheme=v2,com.docker.compose.depends_on=,com.docker.compose.image=sha256:1d04b9ba1d4996401f2552b51beda8187f175c0645c091e4781134fc9c9a3eef,com.docker.compose.oneoff=False,com.docker.compose.project.config_files=C:\\Users\\User\\Desktop\\vysoko-nagr 3\\compose.yaml,com.docker.compose.project.working_dir=C:\\Users\\User\\Desktop\\vysoko-nagr 3,com.docker.compose.service=db","LocalVolumes":"1","Mounts":"/run/desktop/m…,lyakhonov-lab3…","Name":"lyakhonov-lab3-db-1","Names":"lyakhonov-lab3-db-1","Networks":"lyakhonov-lab3_default","Ports":"5432/tcp","Project":"lyakhonov-lab3","Publishers":[{"URL":"","TargetPort":5432,"PublishedPort":0,"Protocol":"tcp"}],"RunningFor":"2 minutes ago","Service":"db","Size":"0B","State":"running","Status":"Up 22 seconds (healthy)"}
|
||||
{"Command":"\"docker-entrypoint.s…\"","CreatedAt":"2026-10-23 18:29:58 +0300 MSK","ExitCode":0,"Health":"healthy","ID":"4577101bc498","Image":"haproxy:3.0.6-alpine","Labels":"desktop.docker.io/binds/0/Source=C:\\Users\\User\\Desktop\\vysoko-nagr 3\\infra\\haproxy.cfg,com.docker.compose.service=lb,com.docker.compose.container-number=1,com.docker.compose.image=sha256:c22c8710886104a48b920306f063401f0d11811858e3c6b9d87d88a7556b2e61,com.docker.compose.oneoff=False,com.docker.compose.project=lyakhonov-lab3,com.docker.compose.project.working_dir=C:\\Users\\User\\Desktop\\vysoko-nagr 3,desktop.docker.io/ports.scheme=v2,desktop.docker.io/ports/8080/tcp=127.0.0.1:8080,com.docker.compose.config-hash=c1b282a081343dbd036539a8c3bd364189a89534f9629cd69621bf9b57b5c061,com.docker.compose.depends_on=api:service_started:false,com.docker.compose.project.config_files=C:\\Users\\User\\Desktop\\vysoko-nagr 3\\compose.yaml,com.docker.compose.version=2.40.3,desktop.docker.io/binds/0/SourceKind=hostFile,desktop.docker.io/binds/0/Target=/usr/local/etc/haproxy/haproxy.cfg","LocalVolumes":"0","Mounts":"/run/desktop/m…","Name":"lyakhonov-lab3-lb-1","Names":"lyakhonov-lab3-lb-1","Networks":"lyakhonov-lab3_default","Ports":"127.0.0.1:8080-\u003e8080/tcp","Project":"lyakhonov-lab3","Publishers":[{"URL":"127.0.0.1","TargetPort":8080,"PublishedPort":8080,"Protocol":"tcp"}],"RunningFor":"2 minutes ago","Service":"lb","Size":"0B","State":"running","Status":"Up 22 seconds (healthy)"}
|
||||
{"Command":"\"python -m src.migra…\"","CreatedAt":"2026-10-23 18:31:23 +0300 MSK","ExitCode":0,"Health":"","ID":"c52ff4396329","Image":"lyakhonov-messenger:lab3","Labels":"com.docker.compose.depends_on=db:service_healthy:false,com.docker.compose.project=lyakhonov-lab3,com.docker.compose.service=migrate,desktop.docker.io/mounts/0/SourceKind=hostFile,com.docker.compose.config-hash=da46b111c5f3fa5d397c163d5add9113f69561f1561daa6ab1fba452f763242b,com.docker.compose.container-number=1,com.docker.compose.version=2.40.3,desktop.docker.io/mounts/0/Target=/run/secrets/database_url,com.docker.compose.image=sha256:f65f532e3042a0f9f8fcd9ffbf1722aaf432e327ced9f7a9bf0562e21d4c2ac8,com.docker.compose.oneoff=False,com.docker.compose.project.working_dir=C:\\Users\\User\\Desktop\\vysoko-nagr 3,desktop.docker.io/ports.scheme=v2,com.docker.compose.project.config_files=C:\\Users\\User\\Desktop\\vysoko-nagr 3\\compose.yaml,com.docker.compose.replace=migrate-1,desktop.docker.io/mounts/0/Source=C:\\Users\\User\\Desktop\\vysoko-nagr 3\\secrets\\database_url","LocalVolumes":"0","Mounts":"/run/desktop/m…","Name":"lyakhonov-lab3-migrate-1","Names":"lyakhonov-lab3-migrate-1","Networks":"lyakhonov-lab3_default","Ports":"","Project":"lyakhonov-lab3","Publishers":[],"RunningFor":"About a minute ago","Service":"migrate","Size":"0B","State":"exited","Status":"Exited (0) About a minute ago"}
|
||||
{"Command":"\"docker-entrypoint.s…\"","CreatedAt":"2026-10-23 18:29:58 +0300 MSK","ExitCode":0,"Health":"","ID":"889db8e55eb2","Image":"redis:7.4.1-alpine","Labels":"com.docker.compose.project.config_files=C:\\Users\\User\\Desktop\\vysoko-nagr 3\\compose.yaml,com.docker.compose.project.working_dir=C:\\Users\\User\\Desktop\\vysoko-nagr 3,com.docker.compose.version=2.40.3,com.docker.compose.config-hash=8484e75b165c3444cbb27a6887af7c18d49a9970a0c13127eb76917ce9adf837,com.docker.compose.container-number=1,com.docker.compose.depends_on=,com.docker.compose.image=sha256:c1e88455c85225310bbea54816e9c3f4b5295815e6dbf80c34d40afc6df28275,com.docker.compose.oneoff=False,com.docker.compose.service=redis,desktop.docker.io/ports.scheme=v2,com.docker.compose.project=lyakhonov-lab3","LocalVolumes":"1","Mounts":"99efe97b370b00…","Name":"lyakhonov-lab3-redis-1","Names":"lyakhonov-lab3-redis-1","Networks":"lyakhonov-lab3_default","Ports":"6379/tcp","Project":"lyakhonov-lab3","Publishers":[{"URL":"","TargetPort":6379,"PublishedPort":0,"Protocol":"tcp"}],"RunningFor":"2 minutes ago","Service":"redis","Size":"0B","State":"running","Status":"Up 22 seconds"}
|
||||
{"Command":"\"python -m uvicorn s…\"","CreatedAt":"2026-10-23 19:05:09 +0300 MSK","ExitCode":0,"Health":"","ID":"e37175f9a3fa","Image":"lyakhonov-messenger:lab3","Labels":"desktop.docker.io/mounts/0/SourceKind=hostFile,desktop.docker.io/mounts/0/Target=/run/secrets/database_url,com.docker.compose.image=sha256:639e8935bac8e884626a86dc4bd71c623e1b5495ee6376a7e9e90583329c7292,com.docker.compose.oneoff=False,com.docker.compose.project.working_dir=C:\\Users\\User\\Desktop\\vysoko-nagr 3,desktop.docker.io/mounts/0/Source=C:\\Users\\User\\Desktop\\vysoko-nagr 3\\secrets\\database_url,com.docker.compose.project=lyakhonov-lab3,com.docker.compose.container-number=10,com.docker.compose.project.config_files=C:\\Users\\User\\Desktop\\vysoko-nagr 3\\compose.yaml,com.docker.compose.service=api,desktop.docker.io/ports.scheme=v2,com.docker.compose.config-hash=266d51102adf95b26fad565654ce091b36e87c7e55ca953339603fcd72da0e48,com.docker.compose.depends_on=migrate:service_completed_successfully:false,com.docker.compose.replace=api-10,com.docker.compose.version=2.40.3","LocalVolumes":"0","Mounts":"/run/desktop/m…","Name":"lyakhonov-lab3-api-10","Names":"lyakhonov-lab3-api-10","Networks":"lyakhonov-lab3_default","Ports":"","Project":"lyakhonov-lab3","Publishers":[],"RunningFor":"About a minute ago","Service":"api","Size":"0B","State":"exited","Status":"Exited (0) 13 seconds ago"}
|
||||
{"Command":"\"python -m uvicorn s…\"","CreatedAt":"2026-10-23 19:05:09 +0300 MSK","ExitCode":0,"Health":"healthy","ID":"612c05caacd4","Image":"lyakhonov-messenger:lab3","Labels":"com.docker.compose.project=lyakhonov-lab3,desktop.docker.io/mounts/0/SourceKind=hostFile,desktop.docker.io/ports.scheme=v2,com.docker.compose.oneoff=False,desktop.docker.io/mounts/0/Source=C:\\Users\\User\\Desktop\\vysoko-nagr 3\\secrets\\database_url,com.docker.compose.service=api,com.docker.compose.config-hash=266d51102adf95b26fad565654ce091b36e87c7e55ca953339603fcd72da0e48,com.docker.compose.container-number=9,com.docker.compose.project.config_files=C:\\Users\\User\\Desktop\\vysoko-nagr 3\\compose.yaml,com.docker.compose.project.working_dir=C:\\Users\\User\\Desktop\\vysoko-nagr 3,com.docker.compose.replace=api-9,com.docker.compose.version=2.40.3,desktop.docker.io/mounts/0/Target=/run/secrets/database_url,com.docker.compose.depends_on=migrate:service_completed_successfully:false,com.docker.compose.image=sha256:639e8935bac8e884626a86dc4bd71c623e1b5495ee6376a7e9e90583329c7292","LocalVolumes":"0","Mounts":"/run/desktop/m…","Name":"lyakhonov-lab3-api-9","Names":"lyakhonov-lab3-api-9","Networks":"lyakhonov-lab3_default","Ports":"8080/tcp","Project":"lyakhonov-lab3","Publishers":[{"URL":"","TargetPort":8080,"PublishedPort":0,"Protocol":"tcp"}],"RunningFor":"About a minute ago","Service":"api","Size":"0B","State":"running","Status":"Up About a minute (healthy)"}
|
||||
{"Command":"\"docker-entrypoint.s…\"","CreatedAt":"2026-10-23 18:29:58 +0300 MSK","ExitCode":0,"Health":"healthy","ID":"f2cdcc232751","Image":"postgres:16.6-alpine","Labels":"com.docker.compose.project.working_dir=C:\\Users\\User\\Desktop\\vysoko-nagr 3,com.docker.compose.version=2.40.3,desktop.docker.io/mounts/0/Source=C:\\Users\\User\\Desktop\\vysoko-nagr 3\\secrets\\db_password,desktop.docker.io/mounts/0/Target=/run/secrets/db_password,com.docker.compose.depends_on=,com.docker.compose.oneoff=False,com.docker.compose.project.config_files=C:\\Users\\User\\Desktop\\vysoko-nagr 3\\compose.yaml,com.docker.compose.service=db,desktop.docker.io/mounts/0/SourceKind=hostFile,desktop.docker.io/ports.scheme=v2,com.docker.compose.config-hash=fa2b9ebefd39686b3404aa264a806204d268522150797263203427d945e51cd6,com.docker.compose.container-number=1,com.docker.compose.image=sha256:1d04b9ba1d4996401f2552b51beda8187f175c0645c091e4781134fc9c9a3eef,com.docker.compose.project=lyakhonov-lab3","LocalVolumes":"1","Mounts":"/run/desktop/m…,lyakhonov-lab3…","Name":"lyakhonov-lab3-db-1","Names":"lyakhonov-lab3-db-1","Networks":"lyakhonov-lab3_default","Ports":"5432/tcp","Project":"lyakhonov-lab3","Publishers":[{"URL":"","TargetPort":5432,"PublishedPort":0,"Protocol":"tcp"}],"RunningFor":"36 minutes ago","Service":"db","Size":"0B","State":"running","Status":"Up 21 seconds (healthy)"}
|
||||
{"Command":"\"docker-entrypoint.s…\"","CreatedAt":"2026-10-23 18:29:58 +0300 MSK","ExitCode":0,"Health":"healthy","ID":"4577101bc498","Image":"haproxy:3.0.6-alpine","Labels":"com.docker.compose.config-hash=c1b282a081343dbd036539a8c3bd364189a89534f9629cd69621bf9b57b5c061,com.docker.compose.depends_on=api:service_started:false,com.docker.compose.image=sha256:c22c8710886104a48b920306f063401f0d11811858e3c6b9d87d88a7556b2e61,desktop.docker.io/binds/0/Target=/usr/local/etc/haproxy/haproxy.cfg,com.docker.compose.container-number=1,com.docker.compose.project.config_files=C:\\Users\\User\\Desktop\\vysoko-nagr 3\\compose.yaml,com.docker.compose.project.working_dir=C:\\Users\\User\\Desktop\\vysoko-nagr 3,desktop.docker.io/binds/0/Source=C:\\Users\\User\\Desktop\\vysoko-nagr 3\\infra\\haproxy.cfg,desktop.docker.io/binds/0/SourceKind=hostFile,com.docker.compose.version=2.40.3,desktop.docker.io/ports.scheme=v2,com.docker.compose.oneoff=False,com.docker.compose.project=lyakhonov-lab3,com.docker.compose.service=lb,desktop.docker.io/ports/8080/tcp=127.0.0.1:8080","LocalVolumes":"0","Mounts":"/run/desktop/m…","Name":"lyakhonov-lab3-lb-1","Names":"lyakhonov-lab3-lb-1","Networks":"lyakhonov-lab3_default","Ports":"127.0.0.1:8080-\u003e8080/tcp","Project":"lyakhonov-lab3","Publishers":[{"URL":"127.0.0.1","TargetPort":8080,"PublishedPort":8080,"Protocol":"tcp"}],"RunningFor":"36 minutes ago","Service":"lb","Size":"0B","State":"running","Status":"Up 2 minutes (healthy)"}
|
||||
{"Command":"\"python -m src.migra…\"","CreatedAt":"2026-10-23 19:05:08 +0300 MSK","ExitCode":0,"Health":"","ID":"1031c94e3574","Image":"lyakhonov-messenger:lab3","Labels":"com.docker.compose.oneoff=False,com.docker.compose.project.working_dir=C:\\Users\\User\\Desktop\\vysoko-nagr 3,desktop.docker.io/mounts/0/Target=/run/secrets/database_url,desktop.docker.io/ports.scheme=v2,com.docker.compose.config-hash=8769eace7a6a1e1092198d406a7c10a8c417bc97737d952ee0fe97abf2fb98de,com.docker.compose.depends_on=db:service_healthy:false,com.docker.compose.image=sha256:639e8935bac8e884626a86dc4bd71c623e1b5495ee6376a7e9e90583329c7292,com.docker.compose.version=2.40.3,desktop.docker.io/mounts/0/Source=C:\\Users\\User\\Desktop\\vysoko-nagr 3\\secrets\\database_url,com.docker.compose.container-number=1,com.docker.compose.project=lyakhonov-lab3,com.docker.compose.project.config_files=C:\\Users\\User\\Desktop\\vysoko-nagr 3\\compose.yaml,com.docker.compose.replace=migrate-1,com.docker.compose.service=migrate,desktop.docker.io/mounts/0/SourceKind=hostFile","LocalVolumes":"0","Mounts":"/run/desktop/m…","Name":"lyakhonov-lab3-migrate-1","Names":"lyakhonov-lab3-migrate-1","Networks":"lyakhonov-lab3_default","Ports":"","Project":"lyakhonov-lab3","Publishers":[],"RunningFor":"About a minute ago","Service":"migrate","Size":"0B","State":"exited","Status":"Exited (0) 18 seconds ago"}
|
||||
{"Command":"\"docker-entrypoint.s…\"","CreatedAt":"2026-10-23 18:29:58 +0300 MSK","ExitCode":0,"Health":"","ID":"889db8e55eb2","Image":"redis:7.4.1-alpine","Labels":"com.docker.compose.image=sha256:c1e88455c85225310bbea54816e9c3f4b5295815e6dbf80c34d40afc6df28275,com.docker.compose.project=lyakhonov-lab3,com.docker.compose.service=redis,com.docker.compose.version=2.40.3,desktop.docker.io/ports.scheme=v2,com.docker.compose.config-hash=8484e75b165c3444cbb27a6887af7c18d49a9970a0c13127eb76917ce9adf837,com.docker.compose.depends_on=,com.docker.compose.oneoff=False,com.docker.compose.project.config_files=C:\\Users\\User\\Desktop\\vysoko-nagr 3\\compose.yaml,com.docker.compose.project.working_dir=C:\\Users\\User\\Desktop\\vysoko-nagr 3,com.docker.compose.container-number=1","LocalVolumes":"1","Mounts":"99efe97b370b00…","Name":"lyakhonov-lab3-redis-1","Names":"lyakhonov-lab3-redis-1","Networks":"lyakhonov-lab3_default","Ports":"6379/tcp","Project":"lyakhonov-lab3","Publishers":[{"URL":"","TargetPort":6379,"PublishedPort":0,"Protocol":"tcp"}],"RunningFor":"36 minutes ago","Service":"redis","Size":"0B","State":"running","Status":"Up 26 seconds"}
|
||||
|
||||
@@ -1,7 +1,3 @@
|
||||
'test' is not recognized as an internal or external command,
|
||||
operable program or batch file.
|
||||
"Set ACTION_SCRIPT to your implemented executable stop-one hook"; exit 2
|
||||
python tests/resilience.py --mode failover --action-script "scripts/stop-one.cmd" --base-url "http://localhost:8080"
|
||||
Executing explicit failover hook; hook output suppressed to avoid leaking secrets.
|
||||
{"observed_instances_before": 2, "successful_writes": 89, "failed_attempts": 4, "first_recovery_seconds": 3.114}
|
||||
{"observed_instances_before": 2, "successful_writes": 93, "failed_attempts": 3, "first_recovery_seconds": 2.875}
|
||||
PASS: failover preserved confirmed data and existing session. Hook scope needs operator evidence.
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{"Command":"\"python -m uvicorn s…\"","CreatedAt":"2026-10-23 18:31:24 +0300 MSK","ExitCode":0,"Health":"starting","ID":"c086e70205ab","Image":"lyakhonov-messenger:lab3","Labels":"com.docker.compose.project.config_files=C:\\Users\\User\\Desktop\\vysoko-nagr 3\\compose.yaml,com.docker.compose.project.working_dir=C:\\Users\\User\\Desktop\\vysoko-nagr 3,desktop.docker.io/ports.scheme=v2,com.docker.compose.container-number=1,com.docker.compose.project=lyakhonov-lab3,desktop.docker.io/mounts/0/Source=C:\\Users\\User\\Desktop\\vysoko-nagr 3\\secrets\\database_url,desktop.docker.io/mounts/0/Target=/run/secrets/database_url,com.docker.compose.image=sha256:f65f532e3042a0f9f8fcd9ffbf1722aaf432e327ced9f7a9bf0562e21d4c2ac8,desktop.docker.io/mounts/0/SourceKind=hostFile,com.docker.compose.config-hash=93b46b7eddf2f406e22ff9739f28d29e78cf3fb8c27d6862629d64204aa83029,com.docker.compose.replace=api-1,com.docker.compose.service=api,com.docker.compose.version=2.40.3,com.docker.compose.depends_on=migrate:service_completed_successfully:false,com.docker.compose.oneoff=False","LocalVolumes":"0","Mounts":"/run/desktop/m…","Name":"lyakhonov-lab3-api-1","Names":"lyakhonov-lab3-api-1","Networks":"lyakhonov-lab3_default","Ports":"8080/tcp","Project":"lyakhonov-lab3","Publishers":[{"URL":"","TargetPort":8080,"PublishedPort":0,"Protocol":"tcp"}],"RunningFor":"2 minutes ago","Service":"api","Size":"0B","State":"running","Status":"Up 3 seconds (health: starting)"}
|
||||
{"Command":"\"python -m uvicorn s…\"","CreatedAt":"2026-10-23 18:31:24 +0300 MSK","ExitCode":0,"Health":"healthy","ID":"1522443443f2","Image":"lyakhonov-messenger:lab3","Labels":"com.docker.compose.image=sha256:f65f532e3042a0f9f8fcd9ffbf1722aaf432e327ced9f7a9bf0562e21d4c2ac8,com.docker.compose.project=lyakhonov-lab3,com.docker.compose.project.config_files=C:\\Users\\User\\Desktop\\vysoko-nagr 3\\compose.yaml,desktop.docker.io/mounts/0/Source=C:\\Users\\User\\Desktop\\vysoko-nagr 3\\secrets\\database_url,desktop.docker.io/mounts/0/Target=/run/secrets/database_url,com.docker.compose.config-hash=93b46b7eddf2f406e22ff9739f28d29e78cf3fb8c27d6862629d64204aa83029,com.docker.compose.depends_on=migrate:service_completed_successfully:false,com.docker.compose.replace=api-2,desktop.docker.io/mounts/0/SourceKind=hostFile,com.docker.compose.container-number=2,com.docker.compose.service=api,com.docker.compose.version=2.40.3,desktop.docker.io/ports.scheme=v2,com.docker.compose.oneoff=False,com.docker.compose.project.working_dir=C:\\Users\\User\\Desktop\\vysoko-nagr 3","LocalVolumes":"0","Mounts":"/run/desktop/m…","Name":"lyakhonov-lab3-api-2","Names":"lyakhonov-lab3-api-2","Networks":"lyakhonov-lab3_default","Ports":"8080/tcp","Project":"lyakhonov-lab3","Publishers":[{"URL":"","TargetPort":8080,"PublishedPort":0,"Protocol":"tcp"}],"RunningFor":"2 minutes ago","Service":"api","Size":"0B","State":"running","Status":"Up About a minute (healthy)"}
|
||||
{"Command":"\"docker-entrypoint.s…\"","CreatedAt":"2026-10-23 18:29:58 +0300 MSK","ExitCode":0,"Health":"healthy","ID":"f2cdcc232751","Image":"postgres:16.6-alpine","Labels":"com.docker.compose.project=lyakhonov-lab3,com.docker.compose.project.config_files=C:\\Users\\User\\Desktop\\vysoko-nagr 3\\compose.yaml,com.docker.compose.project.working_dir=C:\\Users\\User\\Desktop\\vysoko-nagr 3,desktop.docker.io/mounts/0/SourceKind=hostFile,com.docker.compose.container-number=1,com.docker.compose.depends_on=,com.docker.compose.oneoff=False,com.docker.compose.service=db,com.docker.compose.version=2.40.3,desktop.docker.io/mounts/0/Source=C:\\Users\\User\\Desktop\\vysoko-nagr 3\\secrets\\db_password,desktop.docker.io/mounts/0/Target=/run/secrets/db_password,desktop.docker.io/ports.scheme=v2,com.docker.compose.config-hash=fa2b9ebefd39686b3404aa264a806204d268522150797263203427d945e51cd6,com.docker.compose.image=sha256:1d04b9ba1d4996401f2552b51beda8187f175c0645c091e4781134fc9c9a3eef","LocalVolumes":"1","Mounts":"/run/desktop/m…,lyakhonov-lab3…","Name":"lyakhonov-lab3-db-1","Names":"lyakhonov-lab3-db-1","Networks":"lyakhonov-lab3_default","Ports":"5432/tcp","Project":"lyakhonov-lab3","Publishers":[{"URL":"","TargetPort":5432,"PublishedPort":0,"Protocol":"tcp"}],"RunningFor":"3 minutes ago","Service":"db","Size":"0B","State":"running","Status":"Up About a minute (healthy)"}
|
||||
{"Command":"\"docker-entrypoint.s…\"","CreatedAt":"2026-10-23 18:29:58 +0300 MSK","ExitCode":0,"Health":"healthy","ID":"4577101bc498","Image":"haproxy:3.0.6-alpine","Labels":"com.docker.compose.project.config_files=C:\\Users\\User\\Desktop\\vysoko-nagr 3\\compose.yaml,desktop.docker.io/binds/0/SourceKind=hostFile,desktop.docker.io/ports.scheme=v2,desktop.docker.io/ports/8080/tcp=127.0.0.1:8080,com.docker.compose.oneoff=False,com.docker.compose.service=lb,com.docker.compose.depends_on=api:service_started:false,com.docker.compose.image=sha256:c22c8710886104a48b920306f063401f0d11811858e3c6b9d87d88a7556b2e61,desktop.docker.io/binds/0/Source=C:\\Users\\User\\Desktop\\vysoko-nagr 3\\infra\\haproxy.cfg,com.docker.compose.config-hash=c1b282a081343dbd036539a8c3bd364189a89534f9629cd69621bf9b57b5c061,com.docker.compose.container-number=1,com.docker.compose.project=lyakhonov-lab3,com.docker.compose.project.working_dir=C:\\Users\\User\\Desktop\\vysoko-nagr 3,com.docker.compose.version=2.40.3,desktop.docker.io/binds/0/Target=/usr/local/etc/haproxy/haproxy.cfg","LocalVolumes":"0","Mounts":"/run/desktop/m…","Name":"lyakhonov-lab3-lb-1","Names":"lyakhonov-lab3-lb-1","Networks":"lyakhonov-lab3_default","Ports":"127.0.0.1:8080-\u003e8080/tcp","Project":"lyakhonov-lab3","Publishers":[{"URL":"127.0.0.1","TargetPort":8080,"PublishedPort":8080,"Protocol":"tcp"}],"RunningFor":"3 minutes ago","Service":"lb","Size":"0B","State":"running","Status":"Up About a minute (healthy)"}
|
||||
{"Command":"\"python -m src.migra…\"","CreatedAt":"2026-10-23 18:31:23 +0300 MSK","ExitCode":0,"Health":"","ID":"c52ff4396329","Image":"lyakhonov-messenger:lab3","Labels":"desktop.docker.io/mounts/0/Source=C:\\Users\\User\\Desktop\\vysoko-nagr 3\\secrets\\database_url,desktop.docker.io/mounts/0/SourceKind=hostFile,com.docker.compose.config-hash=da46b111c5f3fa5d397c163d5add9113f69561f1561daa6ab1fba452f763242b,com.docker.compose.project=lyakhonov-lab3,com.docker.compose.project.working_dir=C:\\Users\\User\\Desktop\\vysoko-nagr 3,desktop.docker.io/mounts/0/Target=/run/secrets/database_url,com.docker.compose.container-number=1,com.docker.compose.depends_on=db:service_healthy:false,com.docker.compose.image=sha256:f65f532e3042a0f9f8fcd9ffbf1722aaf432e327ced9f7a9bf0562e21d4c2ac8,com.docker.compose.oneoff=False,desktop.docker.io/ports.scheme=v2,com.docker.compose.project.config_files=C:\\Users\\User\\Desktop\\vysoko-nagr 3\\compose.yaml,com.docker.compose.replace=migrate-1,com.docker.compose.service=migrate,com.docker.compose.version=2.40.3","LocalVolumes":"0","Mounts":"/run/desktop/m…","Name":"lyakhonov-lab3-migrate-1","Names":"lyakhonov-lab3-migrate-1","Networks":"lyakhonov-lab3_default","Ports":"","Project":"lyakhonov-lab3","Publishers":[],"RunningFor":"2 minutes ago","Service":"migrate","Size":"0B","State":"exited","Status":"Exited (0) 3 seconds ago"}
|
||||
{"Command":"\"docker-entrypoint.s…\"","CreatedAt":"2026-10-23 18:29:58 +0300 MSK","ExitCode":0,"Health":"","ID":"889db8e55eb2","Image":"redis:7.4.1-alpine","Labels":"com.docker.compose.container-number=1,com.docker.compose.oneoff=False,com.docker.compose.project.working_dir=C:\\Users\\User\\Desktop\\vysoko-nagr 3,desktop.docker.io/ports.scheme=v2,com.docker.compose.config-hash=8484e75b165c3444cbb27a6887af7c18d49a9970a0c13127eb76917ce9adf837,com.docker.compose.depends_on=,com.docker.compose.image=sha256:c1e88455c85225310bbea54816e9c3f4b5295815e6dbf80c34d40afc6df28275,com.docker.compose.project=lyakhonov-lab3,com.docker.compose.project.config_files=C:\\Users\\User\\Desktop\\vysoko-nagr 3\\compose.yaml,com.docker.compose.service=redis,com.docker.compose.version=2.40.3","LocalVolumes":"1","Mounts":"99efe97b370b00…","Name":"lyakhonov-lab3-redis-1","Names":"lyakhonov-lab3-redis-1","Networks":"lyakhonov-lab3_default","Ports":"6379/tcp","Project":"lyakhonov-lab3","Publishers":[{"URL":"","TargetPort":6379,"PublishedPort":0,"Protocol":"tcp"}],"RunningFor":"3 minutes ago","Service":"redis","Size":"0B","State":"running","Status":"Up About a minute"}
|
||||
{"Command":"\"python -m uvicorn s…\"","CreatedAt":"2026-10-23 19:05:09 +0300 MSK","ExitCode":0,"Health":"healthy","ID":"e37175f9a3fa","Image":"lyakhonov-messenger:lab3","Labels":"com.docker.compose.container-number=10,com.docker.compose.depends_on=migrate:service_completed_successfully:false,desktop.docker.io/mounts/0/Source=C:\\Users\\User\\Desktop\\vysoko-nagr 3\\secrets\\database_url,desktop.docker.io/mounts/0/SourceKind=hostFile,com.docker.compose.project.working_dir=C:\\Users\\User\\Desktop\\vysoko-nagr 3,com.docker.compose.service=api,desktop.docker.io/mounts/0/Target=/run/secrets/database_url,com.docker.compose.oneoff=False,com.docker.compose.project=lyakhonov-lab3,com.docker.compose.project.config_files=C:\\Users\\User\\Desktop\\vysoko-nagr 3\\compose.yaml,com.docker.compose.version=2.40.3,com.docker.compose.config-hash=266d51102adf95b26fad565654ce091b36e87c7e55ca953339603fcd72da0e48,com.docker.compose.image=sha256:639e8935bac8e884626a86dc4bd71c623e1b5495ee6376a7e9e90583329c7292,com.docker.compose.replace=api-10,desktop.docker.io/ports.scheme=v2","LocalVolumes":"0","Mounts":"/run/desktop/m…","Name":"lyakhonov-lab3-api-10","Names":"lyakhonov-lab3-api-10","Networks":"lyakhonov-lab3_default","Ports":"8080/tcp","Project":"lyakhonov-lab3","Publishers":[{"URL":"","TargetPort":8080,"PublishedPort":0,"Protocol":"tcp"}],"RunningFor":"2 minutes ago","Service":"api","Size":"0B","State":"running","Status":"Up 21 seconds (healthy)"}
|
||||
{"Command":"\"python -m uvicorn s…\"","CreatedAt":"2026-10-23 19:05:09 +0300 MSK","ExitCode":0,"Health":"","ID":"612c05caacd4","Image":"lyakhonov-messenger:lab3","Labels":"com.docker.compose.image=sha256:639e8935bac8e884626a86dc4bd71c623e1b5495ee6376a7e9e90583329c7292,com.docker.compose.project=lyakhonov-lab3,com.docker.compose.project.config_files=C:\\Users\\User\\Desktop\\vysoko-nagr 3\\compose.yaml,com.docker.compose.project.working_dir=C:\\Users\\User\\Desktop\\vysoko-nagr 3,com.docker.compose.service=api,com.docker.compose.config-hash=266d51102adf95b26fad565654ce091b36e87c7e55ca953339603fcd72da0e48,com.docker.compose.depends_on=migrate:service_completed_successfully:false,com.docker.compose.version=2.40.3,desktop.docker.io/mounts/0/Target=/run/secrets/database_url,com.docker.compose.container-number=9,com.docker.compose.oneoff=False,com.docker.compose.replace=api-9,desktop.docker.io/mounts/0/Source=C:\\Users\\User\\Desktop\\vysoko-nagr 3\\secrets\\database_url,desktop.docker.io/mounts/0/SourceKind=hostFile,desktop.docker.io/ports.scheme=v2","LocalVolumes":"0","Mounts":"/run/desktop/m…","Name":"lyakhonov-lab3-api-9","Names":"lyakhonov-lab3-api-9","Networks":"lyakhonov-lab3_default","Ports":"","Project":"lyakhonov-lab3","Publishers":[],"RunningFor":"2 minutes ago","Service":"api","Size":"0B","State":"exited","Status":"Exited (0) 13 seconds ago"}
|
||||
{"Command":"\"docker-entrypoint.s…\"","CreatedAt":"2026-10-23 18:29:58 +0300 MSK","ExitCode":0,"Health":"healthy","ID":"f2cdcc232751","Image":"postgres:16.6-alpine","Labels":"com.docker.compose.project.working_dir=C:\\Users\\User\\Desktop\\vysoko-nagr 3,com.docker.compose.service=db,desktop.docker.io/mounts/0/SourceKind=hostFile,desktop.docker.io/mounts/0/Target=/run/secrets/db_password,desktop.docker.io/ports.scheme=v2,com.docker.compose.config-hash=fa2b9ebefd39686b3404aa264a806204d268522150797263203427d945e51cd6,com.docker.compose.container-number=1,com.docker.compose.depends_on=,com.docker.compose.project=lyakhonov-lab3,com.docker.compose.version=2.40.3,desktop.docker.io/mounts/0/Source=C:\\Users\\User\\Desktop\\vysoko-nagr 3\\secrets\\db_password,com.docker.compose.image=sha256:1d04b9ba1d4996401f2552b51beda8187f175c0645c091e4781134fc9c9a3eef,com.docker.compose.oneoff=False,com.docker.compose.project.config_files=C:\\Users\\User\\Desktop\\vysoko-nagr 3\\compose.yaml","LocalVolumes":"1","Mounts":"/run/desktop/m…,lyakhonov-lab3…","Name":"lyakhonov-lab3-db-1","Names":"lyakhonov-lab3-db-1","Networks":"lyakhonov-lab3_default","Ports":"5432/tcp","Project":"lyakhonov-lab3","Publishers":[{"URL":"","TargetPort":5432,"PublishedPort":0,"Protocol":"tcp"}],"RunningFor":"37 minutes ago","Service":"db","Size":"0B","State":"running","Status":"Up About a minute (healthy)"}
|
||||
{"Command":"\"docker-entrypoint.s…\"","CreatedAt":"2026-10-23 18:29:58 +0300 MSK","ExitCode":0,"Health":"healthy","ID":"4577101bc498","Image":"haproxy:3.0.6-alpine","Labels":"com.docker.compose.config-hash=c1b282a081343dbd036539a8c3bd364189a89534f9629cd69621bf9b57b5c061,com.docker.compose.oneoff=False,com.docker.compose.project=lyakhonov-lab3,com.docker.compose.service=lb,com.docker.compose.depends_on=api:service_started:false,com.docker.compose.project.config_files=C:\\Users\\User\\Desktop\\vysoko-nagr 3\\compose.yaml,desktop.docker.io/binds/0/SourceKind=hostFile,desktop.docker.io/binds/0/Target=/usr/local/etc/haproxy/haproxy.cfg,desktop.docker.io/ports.scheme=v2,com.docker.compose.container-number=1,desktop.docker.io/ports/8080/tcp=127.0.0.1:8080,com.docker.compose.image=sha256:c22c8710886104a48b920306f063401f0d11811858e3c6b9d87d88a7556b2e61,com.docker.compose.project.working_dir=C:\\Users\\User\\Desktop\\vysoko-nagr 3,com.docker.compose.version=2.40.3,desktop.docker.io/binds/0/Source=C:\\Users\\User\\Desktop\\vysoko-nagr 3\\infra\\haproxy.cfg","LocalVolumes":"0","Mounts":"/run/desktop/m…","Name":"lyakhonov-lab3-lb-1","Names":"lyakhonov-lab3-lb-1","Networks":"lyakhonov-lab3_default","Ports":"127.0.0.1:8080-\u003e8080/tcp","Project":"lyakhonov-lab3","Publishers":[{"URL":"127.0.0.1","TargetPort":8080,"PublishedPort":8080,"Protocol":"tcp"}],"RunningFor":"37 minutes ago","Service":"lb","Size":"0B","State":"running","Status":"Up 4 minutes (healthy)"}
|
||||
{"Command":"\"python -m src.migra…\"","CreatedAt":"2026-10-23 19:05:08 +0300 MSK","ExitCode":0,"Health":"","ID":"1031c94e3574","Image":"lyakhonov-messenger:lab3","Labels":"com.docker.compose.project.working_dir=C:\\Users\\User\\Desktop\\vysoko-nagr 3,com.docker.compose.version=2.40.3,com.docker.compose.oneoff=False,com.docker.compose.service=migrate,desktop.docker.io/mounts/0/Target=/run/secrets/database_url,com.docker.compose.container-number=1,com.docker.compose.depends_on=db:service_healthy:false,com.docker.compose.image=sha256:639e8935bac8e884626a86dc4bd71c623e1b5495ee6376a7e9e90583329c7292,desktop.docker.io/mounts/0/Source=C:\\Users\\User\\Desktop\\vysoko-nagr 3\\secrets\\database_url,desktop.docker.io/mounts/0/SourceKind=hostFile,desktop.docker.io/ports.scheme=v2,com.docker.compose.config-hash=8769eace7a6a1e1092198d406a7c10a8c417bc97737d952ee0fe97abf2fb98de,com.docker.compose.project=lyakhonov-lab3,com.docker.compose.project.config_files=C:\\Users\\User\\Desktop\\vysoko-nagr 3\\compose.yaml,com.docker.compose.replace=migrate-1","LocalVolumes":"0","Mounts":"/run/desktop/m…","Name":"lyakhonov-lab3-migrate-1","Names":"lyakhonov-lab3-migrate-1","Networks":"lyakhonov-lab3_default","Ports":"","Project":"lyakhonov-lab3","Publishers":[],"RunningFor":"2 minutes ago","Service":"migrate","Size":"0B","State":"exited","Status":"Exited (0) 21 seconds ago"}
|
||||
{"Command":"\"docker-entrypoint.s…\"","CreatedAt":"2026-10-23 18:29:58 +0300 MSK","ExitCode":0,"Health":"","ID":"889db8e55eb2","Image":"redis:7.4.1-alpine","Labels":"com.docker.compose.config-hash=8484e75b165c3444cbb27a6887af7c18d49a9970a0c13127eb76917ce9adf837,com.docker.compose.depends_on=,com.docker.compose.oneoff=False,com.docker.compose.project=lyakhonov-lab3,com.docker.compose.service=redis,com.docker.compose.version=2.40.3,com.docker.compose.container-number=1,com.docker.compose.image=sha256:c1e88455c85225310bbea54816e9c3f4b5295815e6dbf80c34d40afc6df28275,com.docker.compose.project.config_files=C:\\Users\\User\\Desktop\\vysoko-nagr 3\\compose.yaml,com.docker.compose.project.working_dir=C:\\Users\\User\\Desktop\\vysoko-nagr 3,desktop.docker.io/ports.scheme=v2","LocalVolumes":"1","Mounts":"99efe97b370b00…","Name":"lyakhonov-lab3-redis-1","Names":"lyakhonov-lab3-redis-1","Networks":"lyakhonov-lab3_default","Ports":"6379/tcp","Project":"lyakhonov-lab3","Publishers":[{"URL":"","TargetPort":6379,"PublishedPort":0,"Protocol":"tcp"}],"RunningFor":"37 minutes ago","Service":"redis","Size":"0B","State":"running","Status":"Up About a minute"}
|
||||
|
||||
@@ -1 +1,3 @@
|
||||
python tests/resilience.py --mode failover --action-script "scripts/stop-one.cmd" --base-url "http://localhost:8080"
|
||||
Executing explicit failover hook; hook output suppressed to avoid leaking secrets.
|
||||
{"observed_instances_before": 2, "successful_writes": 97, "failed_attempts": 2, "first_recovery_seconds": 2.755}
|
||||
PASS: failover preserved confirmed data and existing session. Hook scope needs operator evidence.
|
||||
|
||||
@@ -0,0 +1,4 @@
|
||||
python scripts/check_contract.py
|
||||
PASS: offline skeleton structure, local refs and Python syntax; application NOT tested.
|
||||
python tests/smoke.py --base-url "http://localhost:8080"
|
||||
PASS: lab3 public API scenario; infrastructure and grading evidence remain separate.
|
||||
@@ -1 +1 @@
|
||||
PASS: 32 параллельных запроса, 2 реплики; один результат, конфликт, валидация, ACL, области ключа и отзыв сессии.
|
||||
PASS: 32 одинаковых и 16 конфликтующих параллельных запросов, 2 реплики; один результат, конфликт, валидация, ACL, области ключа и отзыв сессии.
|
||||
|
||||
@@ -0,0 +1,15 @@
|
||||
# Завершение общего уровня 4
|
||||
|
||||
Автор: Ляхонов Сергей, БВТ2301. Дата: 23.10.2026.
|
||||
|
||||
Остановлены и восстановлены обе разные реальные реплики api-10 и api-9. Публичные failover-сценарии прошли: восстановление записи 2.875 и 2.755 с, ошибки переходного периода 3 и 2; сохранность и отсутствие дублей подтверждены. См. failover-1/2.txt и снимки контейнеров.
|
||||
|
||||
Полный рестарт API, БД, Redis и LB сохранил прежний токен и данные. StartedAt до/после сохранены. Повтор миграций не создал новых версий: 001 и 002.
|
||||
|
||||
На окончательном образе выполнена поочерёдная замена обоих API под нагрузкой: 1977 успешных ответов, 83 ошибок, 43.73 RPS. Подтверждённых ID проверено 2265; все найдены в истории. Переходные ошибки не скрываются: 4.029%. Доказательство — research/rolling.json с ID старых/новых процессов и временами действий.
|
||||
|
||||
Проверены остановка Redis, ограниченный fallback (0.270 с), остановка PostgreSQL (503 за 3.037 с), восстановление прежней сессии. Исправлено ожидание DNS необязательного кэша: максимум один фоновый вызов, ожидание 250 мс, без роста очереди. Отдельно проверены имитация истечения ключа, транзакционный откат при искусственном 500 и успешный повтор. Trigger теста удалён.
|
||||
|
||||
Smoke, 32 одинаковых и 16 конфликтующих параллельных запросов прошли. Исходный путь записи оставлен воспроизводимым через OPTIMIZED_WRITES=0; улучшенный путь с шестью вместо восьми явных SQL включён по умолчанию. Парная оценка его производительности относится к следующему исследовательскому этапу.
|
||||
|
||||
Настройки timeouts, readiness, SIGTERM, DNS, лимитов и миграций описаны в infra/operations.md. Публичные тесты и обязательный контракт сохранены. CI дополнен отдельным application job; удалённый запуск не заявляется.
|
||||
@@ -0,0 +1,3 @@
|
||||
{
|
||||
"TotalPhysicalMemory": 16778182656
|
||||
}
|
||||
@@ -0,0 +1,2 @@
|
||||
001_initial.sql
|
||||
002_idempotency.sql
|
||||
@@ -1,5 +1,5 @@
|
||||
c086e70205ab46e1d0578d0ddd7c8b81d92b6792b4e7489bca24f4a1ae7cedba 2026-10-23T15:34:55.775855887Z
|
||||
1522443443f214f454783dde216b41c6415269adc0e46293db086093c80e64f8 2026-10-23T15:34:55.822169592Z
|
||||
f2cdcc232751e2c2400763e935897851aca1399824ed751ec96a51180282a207 2026-10-23T15:34:55.199585718Z
|
||||
4577101bc498d9f217ad682ab8af2a4688f7772287a1755eab603ecc946ce2b7 2026-10-23T15:34:55.133175966Z
|
||||
889db8e55eb20c99fbe462f3d407763760cc40f0a053b144dcb9f6d13f6255c8 2026-10-23T15:34:55.264568727Z
|
||||
e37175f9a3fa89d28d266869eb804e06e36502a4702a6661668caf684555bcef 2026-10-23T16:08:02.552700017Z
|
||||
612c05caacd47e750f542e055ebaa578c0f6a221d9091e6ce5df2fa945c52b65 2026-10-23T16:08:02.47911506Z
|
||||
f2cdcc232751e2c2400763e935897851aca1399824ed751ec96a51180282a207 2026-10-23T16:08:02.306518292Z
|
||||
4577101bc498d9f217ad682ab8af2a4688f7772287a1755eab603ecc946ce2b7 2026-10-23T16:08:02.041383013Z
|
||||
889db8e55eb20c99fbe462f3d407763760cc40f0a053b144dcb9f6d13f6255c8 2026-10-23T16:08:02.163804371Z
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
c086e70205ab46e1d0578d0ddd7c8b81d92b6792b4e7489bca24f4a1ae7cedba 2026-10-23T15:33:57.680101854Z
|
||||
1522443443f214f454783dde216b41c6415269adc0e46293db086093c80e64f8 2026-10-23T15:33:57.629513846Z
|
||||
f2cdcc232751e2c2400763e935897851aca1399824ed751ec96a51180282a207 2026-10-23T15:33:57.51109515Z
|
||||
4577101bc498d9f217ad682ab8af2a4688f7772287a1755eab603ecc946ce2b7 2026-10-23T15:33:57.292608383Z
|
||||
889db8e55eb20c99fbe462f3d407763760cc40f0a053b144dcb9f6d13f6255c8 2026-10-23T15:33:57.389825012Z
|
||||
e37175f9a3fa89d28d266869eb804e06e36502a4702a6661668caf684555bcef 2026-10-23T16:07:31.750783546Z
|
||||
612c05caacd47e750f542e055ebaa578c0f6a221d9091e6ce5df2fa945c52b65 2026-10-23T16:07:55.423787453Z
|
||||
f2cdcc232751e2c2400763e935897851aca1399824ed751ec96a51180282a207 2026-10-23T16:06:20.168424171Z
|
||||
4577101bc498d9f217ad682ab8af2a4688f7772287a1755eab603ecc946ce2b7 2026-10-23T16:03:47.244254065Z
|
||||
889db8e55eb20c99fbe462f3d407763760cc40f0a053b144dcb9f6d13f6255c8 2026-10-23T16:06:15.458166414Z
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,2 @@
|
||||
PASS: искусственно состаренный ключ заменён; исходное сообщение сохранено
|
||||
PASS: искусственная ошибка 500 не закэширована; транзакция откатилась, повтор создал одно сообщение
|
||||
@@ -7,4 +7,5 @@
|
||||
В исходном репозитории обнаружены пользовательские изменения scripts/research.py и пяти файлов student-tests; эти файлы не переносились и не изменялись. Секреты, Git, тома, результаты старых экспериментов и сгенерированные данные не переносились.
|
||||
|
||||
Это завершённый этап переноса, а не реализация новых требований lab3. Проверка: make check PYTHON=python.
|
||||
`nНа Windows требуется PYTHONUTF8=1: без него публичный скрипт читает UTF-8 как cp1251.
|
||||
|
||||
На Windows требуется PYTHONUTF8=1: без него публичный скрипт читает UTF-8 как cp1251.
|
||||
|
||||
@@ -0,0 +1,17 @@
|
||||
# Эксплуатационные границы lab3
|
||||
|
||||
Два и более API обслуживают одну PostgreSQL и Redis через HAProxy. Sticky session нет. Внешний порт только у LB. Compose DNS возвращает адреса service api; HAProxy server-template имеет четыре слота, опрашивает DNS с hold valid/obsolete 1 с. Масштабирование этого стенда ограничено четырьмя репликами.
|
||||
|
||||
Readiness API проверяет PostgreSQL; сессии и идемпотентность требуют её доступности. Redis — необязательный кэш профилей; при его отказе читается PostgreSQL. Кэш не хранит сессии или историю. Межрепличный read-after-write обеспечивается чтением основной БД после COMMIT, а не инвалидацией локальной истории.
|
||||
|
||||
Socket timeout Redis не ограничивает системное DNS-разрешение. Поэтому обращения к кэшу выполняет отдельный executor с одним worker и максимум одним незавершённым вызовом. Ожидание результата ограничено 250 мс; занятый worker приводит к немедленному обходу кэша. Очередь DNS-задач не растёт. Неудавшийся необязательный put также не блокирует PostgreSQL. Это устранено после воспроизведённого 504 при остановке Redis; повторная проверка измеряет fallback.
|
||||
|
||||
HAProxy проверяет /health/ready раз в 1 с с timeout check 1 с; fall=2, rise=1. Оценка обнаружения молча недоступного backend — до 4 с при стабильной работе DNS и планировщика; сетевые отказы наблюдаются раньше. Это конфигурационный бюджет, не гарантия времени на перегруженной машине. connect timeout 1 с, server 5 с, client 10 с, retries=0. Повторы POST решает клиент с исходным ключом. Ресурс очереди: 100 обслуживаемых запросов на API; пул 10, max_waiting=32, ожидание пула 3 с; statement timeout 3 с, lock timeout 2 с. Перегрузка и временная недоступность БД дают 503.
|
||||
|
||||
Uvicorn при SIGTERM закрывает listener, дожидается активных запросов до 8 с, затем закрывает пул. Compose stop_grace_period=12 с. LB может увидеть отказ соединения до следующей проверки готовности; такие ошибки учитываются в экспериментах. Никаких автоматических повторов неидемпотентных POST у LB нет.
|
||||
|
||||
Failover hook намеренно использует docker stop --time 1 как сценарий быстрого отказа, оставляет выбранную реплику остановленной и не удаляет её. Rolling-сценарий использует stop --time 10, затем удаление старого контейнера и создание нового; это отдельная проверка согласованного завершения. Нулевое число переходных ошибок не заявляется.
|
||||
|
||||
Сервис migrate запускается до API, содержит advisory lock и версионирование. В Dockerfile API миграции отсутствуют. Повтор migrate безопасен. Миграция 002 добавляет отдельную таблицу и индекс, не изменяет старые столбцы; совместима с чтением работающей версией. При переходе с lab2 нельзя маршрутизировать записи к старому приложению, не понимающему обязательный ключ. Проверенная замена lab3→lab3 эквивалентна rolling deployment; несовместимые изменения API/DDL требуют отдельной стратегии expand/contract.
|
||||
|
||||
Остановка и замена контейнера не доказывают переживание потери узла. Единственный LB, PostgreSQL, Docker-host и его диск остаются SPOF. Единственный Redis не критичен для корректности. Данные находятся в собственном именованном томе lyakhonov-lab3_postgres_data.
|
||||
@@ -0,0 +1,122 @@
|
||||
"""Воспроизводимые серии lab3; контейнеры и тома предыдущей лабы не затрагиваются."""
|
||||
import argparse
|
||||
from datetime import datetime, timezone
|
||||
import json
|
||||
import os
|
||||
from pathlib import Path
|
||||
import random
|
||||
import subprocess
|
||||
import sys
|
||||
import time
|
||||
|
||||
ROOT = Path(__file__).resolve().parents[1]
|
||||
OUT = ROOT / 'evidence' / 'research'
|
||||
OUT.mkdir(parents=True, exist_ok=True)
|
||||
|
||||
|
||||
def command(*args, env=None):
|
||||
r = subprocess.run(args, cwd=ROOT, env=env, text=True, capture_output=True)
|
||||
if r.returncode:
|
||||
raise RuntimeError('Ошибка команды: ' + ' '.join(args[:4]) + '\n' + r.stderr[-2000:])
|
||||
return r.stdout.strip()
|
||||
|
||||
|
||||
def configure(n, cpu, memory, pool, optimized=1):
|
||||
env = dict(os.environ, API_REPLICAS=str(n), API_CPUS=str(cpu), API_MEMORY=f'{memory}m', POOL_SIZE=str(pool), OPTIMIZED_WRITES=str(optimized), PYTHONUTF8='1')
|
||||
command('docker', 'compose', 'up', '-d', '--no-deps', '--scale', f'api={n}', 'api', env=env)
|
||||
command(sys.executable, 'scripts/wait_ready.py', '--replicas', str(n), env=env)
|
||||
return env
|
||||
|
||||
|
||||
def state():
|
||||
ids = command('docker', 'compose', 'ps', '-q').splitlines()
|
||||
return [json.loads(command('docker', 'inspect', '--format', '{{json .State}}', i)) | {'id': i} for i in ids]
|
||||
|
||||
|
||||
def sql(query):
|
||||
return command('docker', 'compose', 'exec', '-T', 'db', 'psql', '-U', 'messenger', '-d', 'messenger', '-Atc', query)
|
||||
|
||||
|
||||
def cpu_counters():
|
||||
result={}
|
||||
for cid in command('docker','compose','ps','-q','api').splitlines():
|
||||
raw=command('docker','exec',cid,'cat','/sys/fs/cgroup/cpu.stat')
|
||||
result[cid]={line.split()[0]:int(line.split()[1]) for line in raw.splitlines()}
|
||||
return result
|
||||
|
||||
|
||||
def benchmark(label, n, cpu, memory, pool, concurrency=32, duration=20, rolling=False, optimized=1):
|
||||
configure(n, cpu, memory, pool, optimized)
|
||||
started = datetime.now(timezone.utc).isoformat()
|
||||
before = sql('SELECT count(*) FROM messages')
|
||||
cpu_before=cpu_counters()
|
||||
before_state = state() if rolling else None
|
||||
args = ['docker', 'run', '--rm', '--name', 'lyakhonov-lab3-load', '--network', 'lyakhonov-lab3_default', '--cpus', '2', '--memory', '512m',
|
||||
'-v', f'{ROOT / "student-tests"}:/work/student-tests:ro', '-v', f'{ROOT / "tests"}:/work/tests:ro',
|
||||
'-v', f'{ROOT / "lab.json"}:/work/lab.json:ro', '-v', f'{ROOT / "contracts"}:/work/contracts:ro',
|
||||
'-w', '/work', 'lyakhonov-messenger:lab3', 'python', 'student-tests/benchmark.py', '--concurrency', str(concurrency), '--duration', str(duration)]
|
||||
proc = subprocess.Popen(args, cwd=ROOT, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True)
|
||||
samples, waits, actions = [], [], []
|
||||
timer = time.monotonic()
|
||||
rolling_ids = command('docker', 'compose', 'ps', '-q', 'api').splitlines() if rolling else []
|
||||
while proc.poll() is None:
|
||||
raw = command('docker', 'stats', '--no-stream', '--format', '{{json .}}')
|
||||
samples.append({'seconds': round(time.monotonic()-timer, 3), 'containers': [json.loads(line) for line in raw.splitlines() if 'lyakhonov-lab3' in line]})
|
||||
waits.append(sql("SELECT coalesce(wait_event_type,'CPU/active')||':'||coalesce(wait_event,'running')||':'||count(*) FROM pg_stat_activity WHERE datname='messenger' AND backend_type='client backend' GROUP BY 1=0,wait_event_type,wait_event"))
|
||||
# Поочерёдная замена каждого контейнера: старый останавливается, новый создаётся с тем же номером сервиса.
|
||||
if rolling and rolling_ids and time.monotonic()-timer > 10 + len(actions)*10:
|
||||
old = rolling_ids.pop(0)
|
||||
step = time.monotonic()
|
||||
command('docker', 'stop', '--time', '10', old)
|
||||
command('docker', 'rm', old)
|
||||
configure(n, cpu, memory, pool)
|
||||
actions.append({'old_id': old, 'start_seconds': step-timer, 'finished_seconds': time.monotonic()-timer})
|
||||
stdout, stderr = proc.communicate()
|
||||
if proc.returncode:
|
||||
raise RuntimeError(stderr)
|
||||
result = json.loads(stdout)
|
||||
cpu_after=cpu_counters()
|
||||
result.update({'label': label, 'started_utc': started, 'replicas': n, 'cpu_per_replica': cpu, 'memory_mib_per_replica': memory, 'pool_per_replica': pool,
|
||||
'database_messages_before': int(before), 'database_messages_after': int(sql('SELECT count(*) FROM messages')),
|
||||
'samples': samples, 'database_waits': waits, 'rolling_actions': actions, 'before_state': before_state, 'after_state': state() if rolling else None})
|
||||
result['api_cgroup_cpu_delta']={cid:{k:v-cpu_before[cid].get(k,0) for k,v in counters.items()} for cid,counters in cpu_after.items() if cid in cpu_before}
|
||||
result['optimized_writes_requested']=optimized
|
||||
result['application_image_id']=command('docker','image','inspect','lyakhonov-messenger:lab3','--format','{{.Id}}')
|
||||
(OUT / (label+'.json')).write_text(json.dumps(result, ensure_ascii=False, indent=2)+'\n', encoding='utf-8')
|
||||
print(label, 'RPS=', round(result['successful_rps'], 2), 'errors=', result['failed_requests'], flush=True)
|
||||
return result
|
||||
|
||||
|
||||
def main():
|
||||
p = argparse.ArgumentParser()
|
||||
p.add_argument('--phase', choices=['pilot', 'matrix', 'saturation', 'pool', 'rolling', 'optimize'], required=True)
|
||||
p.add_argument('--only', action='append', default=[], help='Повторить только названные точки выбранной серии')
|
||||
args = p.parse_args()
|
||||
if args.phase == 'pilot':
|
||||
benchmark('pilot', 2, 1, 512, 10, duration=10)
|
||||
elif args.phase == 'matrix':
|
||||
jobs = [(mode, n, rep) for mode in ['fixed', 'growth'] for n in [1, 2, 4] for rep in range(1, 4)]
|
||||
random.Random(2301).shuffle(jobs)
|
||||
for mode, n, rep in jobs:
|
||||
label=f'{mode}-{n}-{rep}'
|
||||
if not args.only or label in args.only:
|
||||
benchmark(label, n, 2/n if mode=='fixed' else .5, 1024//n if mode=='fixed' else 256, 10)
|
||||
elif args.phase == 'saturation':
|
||||
for concurrency in [4, 16, 64, 128]:
|
||||
for rep in range(1, 3):
|
||||
benchmark(f'saturation-{concurrency}-{rep}', 4, .5, 256, 10, concurrency)
|
||||
elif args.phase == 'pool':
|
||||
for rep in range(1, 4):
|
||||
for pool in ([1,10] if rep%2 else [10,1]):
|
||||
benchmark(f'pool-{pool}-{rep}', 2, 1, 512, pool, 64)
|
||||
elif args.phase == 'rolling':
|
||||
benchmark('rolling', 2, .5, 256, 10, 16, 45, True)
|
||||
elif args.phase == 'optimize':
|
||||
for rep in range(1,4):
|
||||
for mode in ([0,1] if rep%2 else [1,0]):
|
||||
benchmark(f'optimize-{mode}-{rep}',2,1,512,10,32,optimized=mode)
|
||||
configure(2, .5, 256, 10)
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
main()
|
||||
@@ -0,0 +1,51 @@
|
||||
"""Проверить публичным сценарием остановку каждой из двух реальных API-реплик."""
|
||||
import json
|
||||
from datetime import datetime, timezone
|
||||
import os
|
||||
from pathlib import Path
|
||||
import subprocess
|
||||
import sys
|
||||
import urllib.request
|
||||
|
||||
ROOT=Path(__file__).resolve().parents[1]
|
||||
env=dict(os.environ,PYTHONUTF8='1')
|
||||
seen=set()
|
||||
stamp=datetime.now(timezone.utc).strftime('%H%M%S')
|
||||
|
||||
|
||||
def run(*args):
|
||||
return subprocess.check_output(args,cwd=ROOT,env=env,text=True,encoding='utf-8').strip()
|
||||
|
||||
|
||||
for attempt in range(1,9):
|
||||
run('docker','compose','start','api')
|
||||
run(sys.executable,'scripts/wait_ready.py','--replicas','2')
|
||||
# Обычные запросы меняют позицию round-robin; повтор нужен, если снова выбрана уже проверенная реплика.
|
||||
for _ in range(attempt%3):
|
||||
with urllib.request.urlopen('http://localhost:8080/health/ready',timeout=3) as r:
|
||||
r.read()
|
||||
hook='scripts/stop-one.cmd' if os.name=='nt' else 'scripts/stop-one.sh'
|
||||
output=run(sys.executable,'tests/resilience.py','--mode','failover','--action-script',hook)
|
||||
snapshot=run('docker','compose','ps','-a','--format','json')
|
||||
rows=[json.loads(line) for line in snapshot.splitlines()]
|
||||
stopped=[r for r in rows if r['Service']=='api' and r['State']=='exited']
|
||||
if len(stopped)!=1:
|
||||
raise SystemExit('Нужна ровно одна остановленная API')
|
||||
name=stopped[0]['Name']
|
||||
audit=ROOT/'evidence/research-audit'
|
||||
audit.mkdir(exist_ok=True)
|
||||
(audit/f'failover-{stamp}-attempt-{attempt}.txt').write_text(output+'\n',encoding='utf-8')
|
||||
(audit/f'failover-{stamp}-attempt-{attempt}-containers.jsonl').write_text(snapshot+'\n',encoding='utf-8')
|
||||
if name not in seen:
|
||||
seen.add(name)
|
||||
index=len(seen)
|
||||
(ROOT/f'evidence/failover-{index}.txt').write_text(output+'\n',encoding='utf-8')
|
||||
(ROOT/f'evidence/failover-{index}-containers.jsonl').write_text(snapshot+'\n',encoding='utf-8')
|
||||
print('PASS:',name,'отказ проверен',flush=True)
|
||||
if len(seen)==2:
|
||||
break
|
||||
else:
|
||||
raise SystemExit('Не удалось наблюдать отказ двух разных реплик')
|
||||
run('docker','compose','start','api')
|
||||
run(sys.executable,'scripts/wait_ready.py','--replicas','2')
|
||||
print('PASS: обе реальные реплики проверены по очереди и восстановлены')
|
||||
@@ -15,6 +15,7 @@ for _ in range(120):
|
||||
if len(observed)>=args.replicas:
|
||||
print('PASS: API ready, replicas:', len(observed))
|
||||
break
|
||||
time.sleep(0.1)
|
||||
except Exception:
|
||||
time.sleep(0.5)
|
||||
else:
|
||||
|
||||
+3
-1
@@ -3,7 +3,7 @@ import os
|
||||
import socket
|
||||
from contextlib import asynccontextmanager
|
||||
import psycopg
|
||||
from psycopg_pool import PoolTimeout
|
||||
from psycopg_pool import PoolTimeout, TooManyRequests
|
||||
from starlette.concurrency import run_in_threadpool
|
||||
|
||||
from fastapi import FastAPI, Request
|
||||
@@ -32,7 +32,9 @@ def create_app() -> FastAPI:
|
||||
|
||||
@app.exception_handler(psycopg.OperationalError)
|
||||
@app.exception_handler(psycopg.errors.QueryCanceled)
|
||||
@app.exception_handler(psycopg.errors.LockNotAvailable)
|
||||
@app.exception_handler(PoolTimeout)
|
||||
@app.exception_handler(TooManyRequests)
|
||||
async def dependency_error(request, exc):
|
||||
return JSONResponse(status_code=503, content=ErrorResponse(error={
|
||||
"code": "unavailable", "message": "хранилище временно недоступно",
|
||||
|
||||
+19
-2
@@ -1,6 +1,8 @@
|
||||
"""Необязательный кэш неизменяемого публичного профиля; ошибки обходятся через БД."""
|
||||
import logging
|
||||
import os
|
||||
from concurrent.futures import ThreadPoolExecutor, TimeoutError as FutureTimeout
|
||||
import threading
|
||||
from redis import Redis, RedisError
|
||||
from pydantic import ValidationError
|
||||
from src.config import setting
|
||||
@@ -14,12 +16,27 @@ class ProfileCache:
|
||||
socket_timeout=0.2, max_connections=16) if url else None
|
||||
self.ttl = int(os.getenv('PROFILE_CACHE_TTL_SECONDS','60'))
|
||||
self.hits = self.misses = self.errors = 0
|
||||
# DNS может ждать дольше socket timeout; один фоновый вызов ограничивает и время, и очередь.
|
||||
self._executor = ThreadPoolExecutor(max_workers=1, thread_name_prefix='profile-cache')
|
||||
self._pending = None
|
||||
self._guard = threading.Lock()
|
||||
|
||||
def _bounded(self, action, *args, **kwargs):
|
||||
with self._guard:
|
||||
if self._pending is not None and not self._pending.done():
|
||||
raise RedisError('кэш занят')
|
||||
self._pending = self._executor.submit(action, *args, **kwargs)
|
||||
future = self._pending
|
||||
try:
|
||||
return future.result(timeout=0.25)
|
||||
except FutureTimeout:
|
||||
raise RedisError('истекло время ожидания кэша') from None
|
||||
|
||||
def get(self, user_id):
|
||||
if not self.client:
|
||||
return None
|
||||
try:
|
||||
value = self.client.get('profile:v1:'+user_id)
|
||||
value = self._bounded(self.client.get, 'profile:v1:'+user_id)
|
||||
if value:
|
||||
user=User.model_validate_json(value)
|
||||
if user.id != user_id:
|
||||
@@ -35,7 +52,7 @@ class ProfileCache:
|
||||
def put(self, user):
|
||||
if self.client:
|
||||
try:
|
||||
self.client.set('profile:v1:'+user.id,user.model_dump_json(),ex=self.ttl)
|
||||
self._bounded(self.client.set, 'profile:v1:'+user.id,user.model_dump_json(),ex=self.ttl)
|
||||
except RedisError:
|
||||
self.errors += 1
|
||||
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
from uuid import UUID
|
||||
import re
|
||||
import os
|
||||
|
||||
from fastapi import APIRouter, Depends, HTTPException, Request
|
||||
|
||||
@@ -21,8 +22,12 @@ def create_message(
|
||||
request_id = get_request_id(request)
|
||||
|
||||
chat_id_str = str(chat_id)
|
||||
chat = storage.get_chat(chat_id_str)
|
||||
if not chat or x_user_id not in chat.member_ids:
|
||||
if os.getenv('OPTIMIZED_WRITES','1') == '1':
|
||||
allowed = storage.is_chat_member(chat_id_str, x_user_id)
|
||||
else:
|
||||
chat = storage.get_chat(chat_id_str)
|
||||
allowed = bool(chat and x_user_id in chat.member_ids)
|
||||
if not allowed:
|
||||
raise HTTPException(
|
||||
status_code=404,
|
||||
detail=make_error("not_found", "чат не найден", request_id).model_dump(),
|
||||
|
||||
+11
-2
@@ -178,6 +178,11 @@ class PostgresStorage:
|
||||
members = conn.execute('SELECT user_id FROM chat_members WHERE chat_id=%s ORDER BY user_id', (chat_id,)).fetchall()
|
||||
return Chat(**public_row(row), member_ids=[str(x['user_id']) for x in members])
|
||||
|
||||
def is_chat_member(self, chat_id, user_id):
|
||||
"""Проверить доступ без загрузки всего чата и списка участников."""
|
||||
with self.pool.connection() as conn:
|
||||
return conn.execute('SELECT 1 FROM chat_members WHERE chat_id=%s AND user_id=%s', (chat_id,user_id)).fetchone() is not None
|
||||
|
||||
def list_chats_for_user(self, user_id, cursor, limit):
|
||||
with self.pool.connection() as conn:
|
||||
params = [user_id]
|
||||
@@ -205,9 +210,13 @@ class PostgresStorage:
|
||||
raise ConflictError('ключ уже использован с другим сообщением')
|
||||
row = conn.execute('SELECT * FROM messages WHERE id=%s', (old['message_id'],)).fetchone()
|
||||
return Message(**public_row(row))
|
||||
conn.execute('DELETE FROM message_requests WHERE user_id=%s AND chat_id=%s AND key=%s', (sender_id,chat_id,key))
|
||||
optimized = os.getenv('OPTIMIZED_WRITES','1') == '1'
|
||||
if not optimized:
|
||||
conn.execute('DELETE FROM message_requests WHERE user_id=%s AND chat_id=%s AND key=%s', (sender_id,chat_id,key))
|
||||
row = conn.execute('INSERT INTO messages (id,chat_id,sender_id,text) VALUES (%s,%s,%s,%s) RETURNING *', (uuid.uuid4(),chat_id,sender_id,text)).fetchone()
|
||||
conn.execute("INSERT INTO message_requests VALUES (%s,%s,%s,%s,%s,clock_timestamp()+interval '24 hours')", (sender_id,chat_id,key,text,row['id']))
|
||||
# Под той же блокировкой UPSERT заменяет просроченный результат без отдельного DELETE.
|
||||
suffix = ' ON CONFLICT (user_id,chat_id,key) DO UPDATE SET body=EXCLUDED.body,message_id=EXCLUDED.message_id,expires_at=EXCLUDED.expires_at' if optimized else ''
|
||||
conn.execute("INSERT INTO message_requests VALUES (%s,%s,%s,%s,%s,clock_timestamp()+interval '24 hours')"+suffix, (sender_id,chat_id,key,text,row['id']))
|
||||
return Message(**public_row(row))
|
||||
|
||||
def list_messages(self, chat_id, cursor, limit):
|
||||
|
||||
@@ -0,0 +1,19 @@
|
||||
# Собственные проверки лабораторной 3
|
||||
|
||||
Все тесты создают только синтетические данные. Работать из корня проекта. На Windows установить `PYTHONUTF8=1`.
|
||||
|
||||
- `python student-tests/test_lab3.py`: 32 конкурентных повтора через LB, наблюдение двух процессов, один результат, 409 для другого тела, неверные ключи, ACL, области пользователя/чата, отзыв сессии.
|
||||
- `python scripts/experiments.py --phase rolling`: поочерёдное удаление и пересоздание каждой API-реплики под нагрузкой. Docker-доступ необходим.
|
||||
- `python scripts/experiments.py --phase matrix`: три повтора 1/2/4 реплик при фиксированных суммарных CPU/RAM и при росте ресурсов. Порядок перемешан с seed=2301.
|
||||
- `python scripts/experiments.py --phase saturation`: интенсивность 4/16/64/128 параллельных клиентов, два повтора каждой точки.
|
||||
- `python scripts/experiments.py --phase pool`: три парных сравнения размера пула 1 и 10 на реплику при конкуренции 64.
|
||||
- `python scripts/experiments.py --phase optimize`: три парных сравнения исходного и улучшенного пути записи в одном образе при одинаковых ресурсах. OPTIMIZED_WRITES=0/1, по умолчанию включено улучшение.
|
||||
- `python student-tests/test_dependencies.py`: явная остановка Redis и PostgreSQL с восстановлением; fallback к БД, ограниченный отказ 503, прежняя сессия после восстановления.
|
||||
- `python student-tests/test_transactions.py`: имитация expiry ключа изменением только собственной тестовой строки, затем искусственная ошибка 500 через временный trigger, снятие trigger и успешный retry того же ключа. Выполнять отдельно от нагрузки; trigger ограничен UUID нового синтетического чата и удаляется в finally.
|
||||
- `python scripts/plot_results.py`: построение графиков Matplotlib из сохранённых JSON, без новых запросов к приложению.
|
||||
|
||||
`benchmark.py` запускается скриптом эксперимента внутри отдельного контейнера (2 CPU, 512 MiB) и той же сети. Каждый поток держит своё HTTP-соединение; прозрачных повторов POST нет. Внутренняя нагрузка также идёт через HAProxy. Секреты и токены в результаты не записываются.
|
||||
|
||||
Начальная история нового чата — 100 сообщений. Прогрев 5 с, замер 20 с (rolling 45 с). Сохраняются p50/p95/p99 успешных запросов, ошибки, ID процессов, размер набора, CPU/RAM и состояния ожидания БД. Это closed-loop эксперимент с coordinated omission, а не доказательство предельной производительности при произвольном входном потоке.
|
||||
|
||||
Публичные тесты tests/ сохранены. Собственные тесты лабораторной 2, привязанные к одиночному API и не передающие обязательный ключ, не выдаются за совместимые тесты лабораторной 3.
|
||||
@@ -0,0 +1,104 @@
|
||||
"""Внутрисетевой генератор: постоянное HTTP-соединение на поток, без повторов POST."""
|
||||
from concurrent.futures import ThreadPoolExecutor
|
||||
from collections import Counter
|
||||
import argparse
|
||||
import http.client
|
||||
import json
|
||||
import math
|
||||
from pathlib import Path
|
||||
import sys
|
||||
import threading
|
||||
import time
|
||||
import uuid
|
||||
sys.path.insert(0, str(Path(__file__).resolve().parents[1] / 'tests'))
|
||||
from client import Client
|
||||
|
||||
p = argparse.ArgumentParser()
|
||||
p.add_argument('--duration', type=float, default=20)
|
||||
p.add_argument('--concurrency', type=int, default=32)
|
||||
p.add_argument('--warmup', type=float, default=5)
|
||||
p.add_argument('--action', choices=['none', 'rolling'], default='none')
|
||||
args = p.parse_args()
|
||||
c = Client('http://lb:8080')
|
||||
alice, bob, eve, chat = c.bootstrap()
|
||||
path = '/api/v1/chats/' + chat['id'] + '/messages'
|
||||
for i in range(100):
|
||||
c.message(alice, chat, 'Начальная история %d' % i)
|
||||
barrier = threading.Barrier(args.concurrency)
|
||||
|
||||
|
||||
def worker(worker_id):
|
||||
conn = http.client.HTTPConnection('lb', 8080, timeout=5)
|
||||
headers = {'Content-Type': 'application/json', 'Authorization': 'Bearer ' + alice['token']}
|
||||
barrier.wait()
|
||||
start = time.monotonic()
|
||||
measure_start = start + args.warmup
|
||||
deadline = measure_start + args.duration
|
||||
values, failures, instances = [], Counter(), Counter()
|
||||
warm_count = 0
|
||||
confirmed_ids = set()
|
||||
while time.monotonic() < deadline:
|
||||
before = time.monotonic()
|
||||
measured = before >= measure_start
|
||||
headers['Idempotency-Key'] = uuid.uuid4().hex
|
||||
try:
|
||||
conn.request('POST', path, json.dumps({'text': 'Нагрузка ' + 'я' * 240}).encode(), headers)
|
||||
response = conn.getresponse()
|
||||
raw = response.read()
|
||||
payload = json.loads(raw) if response.status == 201 else {}
|
||||
if response.status == 201 and payload.get('chat_id') == chat['id']:
|
||||
confirmed_ids.add(payload['id'])
|
||||
if measured:
|
||||
values.append(time.monotonic() - before)
|
||||
instances[response.getheader('X-Instance-Id')] += 1
|
||||
else:
|
||||
warm_count += 1
|
||||
elif measured:
|
||||
failures[str(response.status)] += 1
|
||||
except (OSError, ValueError, http.client.HTTPException):
|
||||
conn.close()
|
||||
if measured:
|
||||
failures['connection'] += 1
|
||||
conn.close()
|
||||
return values, failures, instances, warm_count, time.monotonic()-measure_start, confirmed_ids
|
||||
|
||||
|
||||
with ThreadPoolExecutor(max_workers=args.concurrency) as pool:
|
||||
results = list(pool.map(worker, range(args.concurrency)))
|
||||
values = sorted(v for r in results for v in r[0])
|
||||
errors, instances = Counter(), Counter()
|
||||
for r in results:
|
||||
errors.update(r[1])
|
||||
instances.update(r[2])
|
||||
elapsed = max(r[4] for r in results)
|
||||
confirmed = set().union(*(r[5] for r in results))
|
||||
seen = set()
|
||||
cursor = None
|
||||
from urllib.parse import quote
|
||||
for _ in range(10000):
|
||||
page = c.call('GET', path+'?limit=100'+('&cursor='+quote(cursor, safe='') if cursor else ''), actor=bob, schema='MessagePage')['json']
|
||||
for item in page['items']:
|
||||
if item['id'] in seen:
|
||||
raise AssertionError('Дубль сообщения в истории')
|
||||
seen.add(item['id'])
|
||||
cursor = page['next_cursor']
|
||||
if cursor is None:
|
||||
break
|
||||
else:
|
||||
raise AssertionError('Превышена граница обхода истории')
|
||||
if not confirmed.issubset(seen):
|
||||
raise AssertionError('Потеря подтверждённого сообщения')
|
||||
|
||||
|
||||
def percentile(q):
|
||||
return round(values[max(0, math.ceil(q*len(values))-1)]*1000, 3) if values else None
|
||||
|
||||
|
||||
print(json.dumps({'duration': args.duration, 'warmup': args.warmup, 'elapsed': elapsed,
|
||||
'concurrency': args.concurrency, 'successful_requests': len(values), 'failed_requests': sum(errors.values()),
|
||||
'errors': dict(errors), 'error_ratio': sum(errors.values()) / max(1, len(values)+sum(errors.values())),
|
||||
'successful_rps': len(values)/elapsed, 'successful_latency_ms': {'p50': percentile(.5), 'p95': percentile(.95), 'p99': percentile(.99)},
|
||||
'instances': dict(instances), 'initial_chat_messages': 100,
|
||||
'confirmed_ids_checked': len(confirmed), 'history_count_after': len(seen), 'confirmed_data_preserved': True,
|
||||
'warmup_messages': sum(r[3] for r in results), 'final_chat_messages_expected_min': 100+sum(r[3] for r in results)+len(values),
|
||||
'note': 'Closed-loop; coordinated omission; percentiles cover successes; no retries; uncertain writes may exist.'}, ensure_ascii=False))
|
||||
@@ -0,0 +1,43 @@
|
||||
"""Проверка ограниченного отказа зависимостей без удаления учебного тома."""
|
||||
from pathlib import Path
|
||||
import subprocess
|
||||
import sys
|
||||
import time
|
||||
import urllib.error
|
||||
import urllib.request
|
||||
sys.path.insert(0,str(Path(__file__).resolve().parents[1]/'tests'))
|
||||
from client import Client, check
|
||||
|
||||
|
||||
def compose(*args):
|
||||
subprocess.run(['docker','compose',*args],check=True,stdout=subprocess.DEVNULL)
|
||||
|
||||
|
||||
c=Client()
|
||||
alice=c.user('dependency')
|
||||
try:
|
||||
compose('stop','redis')
|
||||
cache_started=time.monotonic()
|
||||
check(c.call('GET','/api/v1/users/me',actor=alice,schema='User')['json']['id']==alice['id'],'нет fallback к PostgreSQL')
|
||||
check(time.monotonic()-cache_started<2,'кэш задержал fallback более чем на 2 секунды')
|
||||
print('PASS: Redis остановлен, действующая сессия и профиль доступны из PostgreSQL за',round(time.monotonic()-cache_started,3),'с')
|
||||
finally:
|
||||
compose('start','redis')
|
||||
try:
|
||||
compose('stop','db')
|
||||
started=time.monotonic()
|
||||
req=urllib.request.Request('http://localhost:8080/api/v1/users/me',headers={'Authorization':'Bearer '+alice['token']})
|
||||
try:
|
||||
urllib.request.urlopen(req,timeout=8)
|
||||
except urllib.error.HTTPError as error:
|
||||
check(error.code==503,'при недоступной БД должен быть ограниченный отказ 503')
|
||||
error.close()
|
||||
else:
|
||||
raise AssertionError('запрос доверен при недоступной БД')
|
||||
check(time.monotonic()-started<8,'отказ не ограничен таймаутом')
|
||||
print('PASS: PostgreSQL остановлен; закрытый отказ 503 за',round(time.monotonic()-started,3),'с')
|
||||
finally:
|
||||
compose('start','db')
|
||||
subprocess.run([sys.executable,'scripts/wait_ready.py','--replicas','2'],check=True)
|
||||
check(c.call('GET','/api/v1/users/me',actor=alice,schema='User')['json']['id']==alice['id'],'прежняя сессия не восстановилась')
|
||||
print('PASS: прежняя сессия сохранилась после восстановления БД')
|
||||
@@ -32,6 +32,19 @@ check(other['id'] != results[0]['json']['id'], 'ключ не изолирова
|
||||
second = c.call('POST', '/api/v1/chats', 201, actor=alice,
|
||||
body={'title': 'Другой чат', 'member_ids': [alice['id']]}, schema='Chat')['json']
|
||||
c.message(alice, second, 'Независимый чат', key=key)
|
||||
race_key = uuid.uuid4().hex
|
||||
|
||||
|
||||
def conflict_race(i):
|
||||
return Client().call('POST', path, [201,409], actor=alice,
|
||||
body={'text': 'Тело ' + str(i%2)}, headers={'Idempotency-Key': race_key}, schema='Message')
|
||||
|
||||
|
||||
with ThreadPoolExecutor(max_workers=16) as pool:
|
||||
race = list(pool.map(conflict_race, range(16)))
|
||||
check(sum(r['status']==201 for r in race)==8, 'неверная сериализация разных тел')
|
||||
check(sum(r['status']==409 for r in race)==8, 'не обнаружен конфликт параллельных тел')
|
||||
check(len({r['json']['id'] for r in race if r['status']==201})==1, 'гонка разных тел создала дубли')
|
||||
c.call('DELETE', '/api/v1/auth/sessions/current', 204, actor=alice)
|
||||
c.call('POST', path, 401, actor=alice, body={'text': 'Общий конкурентный ключ'}, headers={'Idempotency-Key': key})
|
||||
print('PASS: 32 параллельных запроса,', len(instances), 'реплики; один результат, конфликт, валидация, ACL, области ключа и отзыв сессии.')
|
||||
print('PASS: 32 одинаковых и 16 конфликтующих параллельных запросов,', len(instances), 'реплики; один результат, конфликт, валидация, ACL, области ключа и отзыв сессии.')
|
||||
|
||||
@@ -0,0 +1,37 @@
|
||||
"""Проверка expiry ключа и отката при искусственной транзиентной ошибке БД."""
|
||||
from pathlib import Path
|
||||
import subprocess
|
||||
import sys
|
||||
import uuid
|
||||
sys.path.insert(0,str(Path(__file__).resolve().parents[1]/'tests'))
|
||||
from client import Client, check
|
||||
|
||||
|
||||
def sql(statement):
|
||||
subprocess.run(['docker','compose','exec','-T','db','psql','-v','ON_ERROR_STOP=1','-U','messenger','-d','messenger','-c',statement],check=True,stdout=subprocess.DEVNULL)
|
||||
|
||||
|
||||
c=Client()
|
||||
alice,bob,eve,chat=c.bootstrap()
|
||||
key=uuid.uuid4().hex
|
||||
first=c.message(alice,chat,'До истечения',key=key)['json']
|
||||
check(c.message(alice,chat,'До истечения',key=key)['json']==first,'результат повтора изменился')
|
||||
# ID и ключ созданы тестом, не берутся из пользовательского ввода.
|
||||
sql(f"UPDATE message_requests SET expires_at=clock_timestamp()-interval '1 second' WHERE chat_id='{chat['id']}' AND key='{key}'")
|
||||
second=c.message(alice,chat,'После истечения',key=key)['json']
|
||||
check(second['id']!=first['id'],'просроченный ключ не переиспользуется')
|
||||
print('PASS: искусственно состаренный ключ заменён; исходное сообщение сохранено')
|
||||
fault_key=uuid.uuid4().hex
|
||||
path='/api/v1/chats/'+chat['id']+'/messages'
|
||||
try:
|
||||
sql(f"""CREATE FUNCTION lab3_inject_failure() RETURNS trigger LANGUAGE plpgsql AS $$
|
||||
BEGIN IF NEW.chat_id='{chat['id']}'::uuid THEN RAISE EXCEPTION 'synthetic failure' USING ERRCODE='P0001'; END IF; RETURN NEW; END $$;
|
||||
CREATE TRIGGER lab3_failure BEFORE INSERT ON messages FOR EACH ROW EXECUTE FUNCTION lab3_inject_failure();""")
|
||||
c.call('POST',path,500,actor=alice,body={'text':'После временной ошибки'},headers={'Idempotency-Key':fault_key})
|
||||
finally:
|
||||
sql('DROP TRIGGER IF EXISTS lab3_failure ON messages; DROP FUNCTION IF EXISTS lab3_inject_failure();')
|
||||
third=c.message(alice,chat,'После временной ошибки',key=fault_key)['json']
|
||||
check(c.message(alice,chat,'После временной ошибки',key=fault_key)['json']==third,'после отката повтор не стабилен')
|
||||
history=c.call('GET',path,actor=bob,schema='MessagePage')['json']['items']
|
||||
check({m['id'] for m in history}=={first['id'],second['id'],third['id']},'потеря или дубли после expiry/отката')
|
||||
print('PASS: искусственная ошибка 500 не закэширована; транзакция откатилась, повтор создал одно сообщение')
|
||||
Reference in New Issue
Block a user