Реализовать обязательный минимум: балансировку, общие повторы и сохранность при отказе
This commit is contained in:
+2
-2
@@ -7,6 +7,6 @@ RUN pip install --no-cache-dir -r requirements.lock.txt
|
||||
COPY src/ src/
|
||||
COPY migrations/ migrations/
|
||||
USER appuser
|
||||
HEALTHCHECK --interval=5s --timeout=5s --start-period=15s --retries=5 CMD python -c "import urllib.request; urllib.request.urlopen('http://localhost:8080/health/ready')"
|
||||
HEALTHCHECK --interval=2s --timeout=2s --start-period=10s --retries=3 CMD python -c "import urllib.request; urllib.request.urlopen('http://localhost:8080/health/ready',timeout=1)"
|
||||
EXPOSE 8080
|
||||
CMD ["sh", "-c", "python -m src.migrate && exec python -m uvicorn src.app:app --host 0.0.0.0 --port 8080 --timeout-graceful-shutdown 8"]
|
||||
CMD ["python", "-m", "uvicorn", "src.app:app", "--host", "0.0.0.0", "--port", "8080", "--timeout-graceful-shutdown", "8", "--timeout-keep-alive", "2", "--no-access-log"]
|
||||
|
||||
@@ -22,9 +22,9 @@ load:
|
||||
$(PYTHON) tests/load.py --base-url "$(BASE_URL)" $(TLS_ARGS)
|
||||
|
||||
test-persistence:
|
||||
@test -n "$(ACTION_SCRIPT)" || (echo "Set ACTION_SCRIPT to your implemented executable restart hook"; exit 2)
|
||||
@$(PYTHON) -c "import sys; sys.exit(0 if '$(ACTION_SCRIPT)' else 'Set ACTION_SCRIPT to your implemented executable restart hook')"
|
||||
$(PYTHON) tests/resilience.py --mode persistence --action-script "$(ACTION_SCRIPT)" --base-url "$(BASE_URL)" $(TLS_ARGS)
|
||||
|
||||
test-failover:
|
||||
@test -n "$(ACTION_SCRIPT)" || (echo "Set ACTION_SCRIPT to your implemented executable stop-one hook"; exit 2)
|
||||
@$(PYTHON) -c "import sys; sys.exit(0 if '$(ACTION_SCRIPT)' else 'Set ACTION_SCRIPT to your implemented executable stop-one hook')"
|
||||
$(PYTHON) tests/resilience.py --mode failover --action-script "$(ACTION_SCRIPT)" --base-url "$(BASE_URL)" $(TLS_ARGS)
|
||||
|
||||
@@ -0,0 +1,69 @@
|
||||
name: lyakhonov-lab3
|
||||
x-api: &api
|
||||
image: lyakhonov-messenger:lab3
|
||||
build: .
|
||||
environment:
|
||||
DATABASE_URL_FILE: /run/secrets/database_url
|
||||
CACHE_URL: redis://redis:6379/0
|
||||
SESSION_TTL_SECONDS: ${SESSION_TTL_SECONDS:-3600}
|
||||
POOL_SIZE: ${POOL_SIZE:-10}
|
||||
secrets: [database_url]
|
||||
depends_on:
|
||||
migrate:
|
||||
condition: service_completed_successfully
|
||||
cpus: ${API_CPUS:-0.5}
|
||||
mem_limit: ${API_MEMORY:-256m}
|
||||
stop_grace_period: 12s
|
||||
services:
|
||||
db:
|
||||
image: postgres:16.6-alpine
|
||||
environment:
|
||||
POSTGRES_USER: messenger
|
||||
POSTGRES_DB: messenger
|
||||
POSTGRES_PASSWORD_FILE: /run/secrets/db_password
|
||||
secrets: [db_password]
|
||||
volumes: [postgres_data:/var/lib/postgresql/data]
|
||||
healthcheck:
|
||||
test: [CMD-SHELL, "pg_isready -U messenger -d messenger"]
|
||||
interval: 2s
|
||||
timeout: 2s
|
||||
retries: 30
|
||||
cpus: 1
|
||||
mem_limit: 512m
|
||||
redis:
|
||||
image: redis:7.4.1-alpine
|
||||
command: [redis-server, --maxmemory, 64mb, --maxmemory-policy, allkeys-lru, --save, "", --appendonly, "no"]
|
||||
cpus: 0.25
|
||||
mem_limit: 128m
|
||||
migrate:
|
||||
<<: *api
|
||||
command: [python, -m, src.migrate]
|
||||
depends_on:
|
||||
db:
|
||||
condition: service_healthy
|
||||
healthcheck:
|
||||
disable: true
|
||||
api:
|
||||
<<: *api
|
||||
deploy:
|
||||
replicas: ${API_REPLICAS:-2}
|
||||
lb:
|
||||
image: haproxy:3.0.6-alpine
|
||||
ports: ["127.0.0.1:8080:8080"]
|
||||
volumes: [./infra/haproxy.cfg:/usr/local/etc/haproxy/haproxy.cfg:ro]
|
||||
depends_on: [api]
|
||||
cpus: 0.5
|
||||
mem_limit: 128m
|
||||
stop_grace_period: 12s
|
||||
healthcheck:
|
||||
test: [CMD, haproxy, -c, -f, /usr/local/etc/haproxy/haproxy.cfg]
|
||||
interval: 5s
|
||||
timeout: 2s
|
||||
retries: 3
|
||||
secrets:
|
||||
db_password:
|
||||
file: ./secrets/db_password
|
||||
database_url:
|
||||
file: ./secrets/database_url
|
||||
volumes:
|
||||
postgres_data:
|
||||
@@ -0,0 +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"}
|
||||
@@ -0,0 +1,7 @@
|
||||
'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}
|
||||
PASS: failover preserved confirmed data and existing session. Hook scope needs operator evidence.
|
||||
@@ -0,0 +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"}
|
||||
@@ -0,0 +1 @@
|
||||
python tests/resilience.py --mode failover --action-script "scripts/stop-one.cmd" --base-url "http://localhost:8080"
|
||||
@@ -0,0 +1 @@
|
||||
PASS: 32 параллельных запроса, 2 реплики; один результат, конфликт, валидация, ACL, области ключа и отзыв сессии.
|
||||
@@ -0,0 +1,13 @@
|
||||
# Завершение обязательного минимума
|
||||
|
||||
Автор: Ляхонов Сергей, БВТ2301. Дата: 23.10.2026.
|
||||
|
||||
Перенесённая база расширена двумя API-процессами, HAProxy и общей транзакционной идемпотентностью PostgreSQL. Миграции выполняет отдельный одноразовый сервис. Наружу опубликован только LB на 127.0.0.1:8080; сессии проверяются в PostgreSQL на каждом запросе. Redis содержит необязательный кэш профилей.
|
||||
|
||||
Результаты: evidence/smoke.txt, evidence/validate.txt, evidence/persistence.txt, evidence/failover-1.txt, evidence/idempotency.txt. Все соответствующие проверки завершились PASS. При первом отказе: 89 подтверждённых записей, 4 ошибки переходного периода, первая запись после завершения hook через 3.114 с. Публичный тест подтвердил сохранность, прежнюю сессию и отсутствие дублей. Состояния реальных контейнеров сохранены отдельно.
|
||||
|
||||
Ключ ограничен пользователем и чатом; метод POST и путь messages фиксированы этим endpoint. Advisory lock по хешу области ключа сериализует конкурентные транзакции, включая разные процессы. Коллизия хеша приводит лишь к лишнему ожиданию. Сообщение и результат ключа записываются в одной транзакции; откат не оставляет результата 5xx. Сравнение нормализованного валидного тела сведено к text: единственное дополнительное допустимое поле attachment_ids может быть только пустым массивом. Повтор проверяет сессию и членство до чтения результата. TTL ровно 24 часа; просроченная запись заменяется при следующем обращении этого ключа. Глобальная фоновая очистка пока отсутствует.
|
||||
|
||||
Windows: PYTHONUTF8=1; .cmd hooks. POSIX: python3 и .sh hooks. В Makefile только проверка наличия ACTION_SCRIPT заменена переносимой Python-командой, публичные тесты сохранены.
|
||||
|
||||
Первые попытки запуска выявили ошибку команды Dockerfile (исправлена до проверок) и отсутствие локального валидатора (установлен в .venv). Первоначальное чтение UTF-8 в cp1251 устранено настройкой PYTHONUTF8. Это не заявляется как успешные проверки приложения.
|
||||
@@ -0,0 +1,6 @@
|
||||
{"Command":"\"python -m uvicorn s…\"","CreatedAt":"2026-10-23 18:31:24 +0300 MSK","ExitCode":0,"Health":"healthy","ID":"c086e70205ab","Image":"lyakhonov-messenger:lab3","Labels":"com.docker.compose.depends_on=migrate:service_completed_successfully:false,com.docker.compose.oneoff=False,com.docker.compose.replace=api-1,desktop.docker.io/ports.scheme=v2,com.docker.compose.project.working_dir=C:\\Users\\User\\Desktop\\vysoko-nagr 3,com.docker.compose.service=api,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,desktop.docker.io/mounts/0/SourceKind=hostFile,com.docker.compose.config-hash=93b46b7eddf2f406e22ff9739f28d29e78cf3fb8c27d6862629d64204aa83029,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.version=2.40.3,com.docker.compose.image=sha256:f65f532e3042a0f9f8fcd9ffbf1722aaf432e327ced9f7a9bf0562e21d4c2ac8","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":"49 seconds ago","Service":"api","Size":"0B","State":"running","Status":"Up 46 seconds (healthy)"}
|
||||
{"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.oneoff=False,com.docker.compose.project.config_files=C:\\Users\\User\\Desktop\\vysoko-nagr 3\\compose.yaml,com.docker.compose.replace=api-2,desktop.docker.io/mounts/0/SourceKind=hostFile,desktop.docker.io/mounts/0/Target=/run/secrets/database_url,com.docker.compose.image=sha256:f65f532e3042a0f9f8fcd9ffbf1722aaf432e327ced9f7a9bf0562e21d4c2ac8,desktop.docker.io/mounts/0/Source=C:\\Users\\User\\Desktop\\vysoko-nagr 3\\secrets\\database_url,com.docker.compose.project.working_dir=C:\\Users\\User\\Desktop\\vysoko-nagr 3,com.docker.compose.service=api,com.docker.compose.version=2.40.3,desktop.docker.io/ports.scheme=v2,com.docker.compose.config-hash=93b46b7eddf2f406e22ff9739f28d29e78cf3fb8c27d6862629d64204aa83029,com.docker.compose.container-number=2,com.docker.compose.depends_on=migrate:service_completed_successfully:false,com.docker.compose.project=lyakhonov-lab3","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":"49 seconds ago","Service":"api","Size":"0B","State":"running","Status":"Up 46 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.config-hash=fa2b9ebefd39686b3404aa264a806204d268522150797263203427d945e51cd6,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,desktop.docker.io/mounts/0/SourceKind=hostFile,desktop.docker.io/mounts/0/Target=/run/secrets/db_password,com.docker.compose.container-number=1,com.docker.compose.project=lyakhonov-lab3,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/ports.scheme=v2","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 2 minutes (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.image=sha256:c22c8710886104a48b920306f063401f0d11811858e3c6b9d87d88a7556b2e61,com.docker.compose.service=lb,com.docker.compose.version=2.40.3,desktop.docker.io/binds/0/Source=C:\\Users\\User\\Desktop\\vysoko-nagr 3\\infra\\haproxy.cfg,desktop.docker.io/binds/0/Target=/usr/local/etc/haproxy/haproxy.cfg,com.docker.compose.container-number=1,com.docker.compose.depends_on=api:service_started:false,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,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.project.working_dir=C:\\Users\\User\\Desktop\\vysoko-nagr 3,desktop.docker.io/binds/0/SourceKind=hostFile","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 2 minutes (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.project.config_files=C:\\Users\\User\\Desktop\\vysoko-nagr 3\\compose.yaml,com.docker.compose.service=migrate,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.project=lyakhonov-lab3,desktop.docker.io/mounts/0/Target=/run/secrets/database_url,com.docker.compose.container-number=1,com.docker.compose.project.working_dir=C:\\Users\\User\\Desktop\\vysoko-nagr 3,com.docker.compose.version=2.40.3,com.docker.compose.depends_on=db:service_healthy:false,com.docker.compose.image=sha256:f65f532e3042a0f9f8fcd9ffbf1722aaf432e327ced9f7a9bf0562e21d4c2ac8,com.docker.compose.oneoff=False,com.docker.compose.replace=migrate-1,com.docker.compose.config-hash=da46b111c5f3fa5d397c163d5add9113f69561f1561daa6ab1fba452f763242b","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":"50 seconds ago","Service":"migrate","Size":"0B","State":"exited","Status":"Exited (0) 47 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.oneoff=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/ports.scheme=v2,com.docker.compose.container-number=1,com.docker.compose.depends_on=,com.docker.compose.project=lyakhonov-lab3,com.docker.compose.project.working_dir=C:\\Users\\User\\Desktop\\vysoko-nagr 3,com.docker.compose.service=redis,com.docker.compose.config-hash=8484e75b165c3444cbb27a6887af7c18d49a9970a0c13127eb76917ce9adf837","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 2 minutes"}
|
||||
@@ -0,0 +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
|
||||
@@ -0,0 +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
|
||||
@@ -0,0 +1,3 @@
|
||||
python tests/resilience.py --mode persistence --action-script "scripts/restart.cmd" --base-url "http://localhost:8080"
|
||||
Executing explicit persistence hook; hook output suppressed to avoid leaking secrets.
|
||||
PASS: persistence preserved confirmed data and existing session. Hook scope needs operator evidence.
|
||||
@@ -0,0 +1,2 @@
|
||||
python tests/smoke.py --base-url "http://localhost:8080"
|
||||
PASS: lab3 public API scenario; infrastructure and grading evidence remain separate.
|
||||
@@ -0,0 +1,2 @@
|
||||
.venv/Scripts/python scripts/validate_openapi.py
|
||||
PASS: full OpenAPI 3.1 and JSON Schema validation; application NOT tested.
|
||||
@@ -0,0 +1,27 @@
|
||||
global
|
||||
log stdout format raw local0
|
||||
maxconn 1024
|
||||
defaults
|
||||
mode http
|
||||
log global
|
||||
timeout connect 1s
|
||||
timeout client 10s
|
||||
timeout server 5s
|
||||
timeout check 1s
|
||||
retries 0
|
||||
resolvers docker
|
||||
nameserver dns 127.0.0.11:53
|
||||
resolve_retries 2
|
||||
timeout resolve 1s
|
||||
timeout retry 1s
|
||||
hold valid 1s
|
||||
hold obsolete 1s
|
||||
frontend public
|
||||
bind :8080
|
||||
default_backend application
|
||||
backend application
|
||||
balance roundrobin
|
||||
option httpchk GET /health/ready
|
||||
http-check expect status 200
|
||||
default-server inter 1s fastinter 500ms downinter 1s fall 2 rise 1
|
||||
server-template api 1-4 api:8080 check resolvers docker init-addr none
|
||||
@@ -0,0 +1,10 @@
|
||||
CREATE TABLE message_requests (
|
||||
user_id uuid NOT NULL REFERENCES users(id),
|
||||
chat_id uuid NOT NULL REFERENCES chats(id),
|
||||
key varchar(128) NOT NULL,
|
||||
body text NOT NULL,
|
||||
message_id uuid NOT NULL REFERENCES messages(id),
|
||||
expires_at timestamptz NOT NULL,
|
||||
PRIMARY KEY (user_id, chat_id, key)
|
||||
);
|
||||
CREATE INDEX message_requests_expiry_idx ON message_requests(expires_at);
|
||||
@@ -0,0 +1,29 @@
|
||||
"""Явные действия оператора только над контейнерами проекта lab3."""
|
||||
import os
|
||||
import subprocess
|
||||
import sys
|
||||
|
||||
|
||||
def docker(*args):
|
||||
return subprocess.check_output(['docker', *args], text=True).strip()
|
||||
|
||||
|
||||
def main():
|
||||
action = sys.argv[1]
|
||||
if action == 'restart':
|
||||
docker('compose', 'restart', 'db', 'redis', 'api', 'lb')
|
||||
elif action == 'stop':
|
||||
target = os.environ['TARGET_INSTANCE_ID'].split('-')[0]
|
||||
containers = docker('compose', 'ps', '-q', 'api').splitlines()
|
||||
for container in containers:
|
||||
hostname = docker('inspect', '--format', '{{.Config.Hostname}}', container)
|
||||
if hostname == target:
|
||||
docker('stop', '--time', '1', container)
|
||||
return
|
||||
raise SystemExit('Выбранная реплика проекта не найдена')
|
||||
else:
|
||||
raise SystemExit('Неизвестное действие')
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
main()
|
||||
@@ -0,0 +1,3 @@
|
||||
@echo off
|
||||
cd /d "%~dp0.."
|
||||
python scripts/control.py restart
|
||||
Executable
+4
@@ -0,0 +1,4 @@
|
||||
#!/bin/sh
|
||||
set -eu
|
||||
cd "$(dirname "$0")/.."
|
||||
python3 scripts/control.py restart
|
||||
@@ -0,0 +1,3 @@
|
||||
@echo off
|
||||
cd /d "%~dp0.."
|
||||
python scripts/control.py stop
|
||||
Executable
+4
@@ -0,0 +1,4 @@
|
||||
#!/bin/sh
|
||||
set -eu
|
||||
cd "$(dirname "$0")/.."
|
||||
python3 scripts/control.py stop
|
||||
@@ -4,13 +4,17 @@ import time
|
||||
import urllib.request
|
||||
parser=argparse.ArgumentParser()
|
||||
parser.add_argument('--base-url',default='http://localhost:8080')
|
||||
parser.add_argument('--replicas',type=int,default=1)
|
||||
args=parser.parse_args()
|
||||
observed=set()
|
||||
for _ in range(120):
|
||||
try:
|
||||
with urllib.request.urlopen(args.base_url+'/health/ready',timeout=2) as response:
|
||||
if response.status==200:
|
||||
print('PASS: API ready')
|
||||
break
|
||||
observed.add(response.headers.get('X-Instance-Id'))
|
||||
if len(observed)>=args.replicas:
|
||||
print('PASS: API ready, replicas:', len(observed))
|
||||
break
|
||||
except Exception:
|
||||
time.sleep(0.5)
|
||||
else:
|
||||
|
||||
+12
-8
@@ -1,4 +1,6 @@
|
||||
import uuid
|
||||
import os
|
||||
import socket
|
||||
from contextlib import asynccontextmanager
|
||||
import psycopg
|
||||
from psycopg_pool import PoolTimeout
|
||||
@@ -25,7 +27,8 @@ def create_app() -> FastAPI:
|
||||
finally:
|
||||
await run_in_threadpool(storage.pool.close)
|
||||
|
||||
app = FastAPI(title="MTUSI Messenger Lab2", version="1.2.0", lifespan=lifespan)
|
||||
instance_id = os.getenv("INSTANCE_ID", socket.gethostname()) + "-" + uuid.uuid4().hex[:8]
|
||||
app = FastAPI(title="MTUSI Messenger Lab3", version="1.3.0", lifespan=lifespan)
|
||||
|
||||
@app.exception_handler(psycopg.OperationalError)
|
||||
@app.exception_handler(psycopg.errors.QueryCanceled)
|
||||
@@ -38,11 +41,11 @@ def create_app() -> FastAPI:
|
||||
|
||||
@app.middleware("http")
|
||||
async def add_request_id(request: Request, call_next):
|
||||
"""Middleware: добавляет X-Request-Id и реализует ограничение очереди запросов (трек 2)."""
|
||||
"""Добавляет идентификаторы запроса и процесса, ограничивает очередь."""
|
||||
request_id = request.headers.get("X-Request-Id", "") or str(uuid.uuid4())
|
||||
request.state.request_id = request_id
|
||||
|
||||
# Трек 2: ограничение очереди запросов — возвращаем 503 при переполнении
|
||||
# Ограничение числа обслуживаемых запросов в процессе.
|
||||
if not storage.acquire_request_slot():
|
||||
return JSONResponse(
|
||||
status_code=503,
|
||||
@@ -53,12 +56,13 @@ def create_app() -> FastAPI:
|
||||
"request_id": request_id,
|
||||
}
|
||||
).model_dump(),
|
||||
headers={"X-Request-Id": request_id},
|
||||
headers={"X-Request-Id": request_id, "X-Instance-Id": instance_id},
|
||||
)
|
||||
|
||||
try:
|
||||
response = await call_next(request)
|
||||
response.headers["X-Request-Id"] = request_id
|
||||
response.headers["X-Instance-Id"] = instance_id
|
||||
return response
|
||||
finally:
|
||||
storage.release_request_slot()
|
||||
@@ -82,7 +86,7 @@ def create_app() -> FastAPI:
|
||||
"request_id": request_id,
|
||||
}
|
||||
).model_dump(),
|
||||
headers={"X-Request-Id": request_id},
|
||||
headers={"X-Request-Id": request_id, "X-Instance-Id": instance_id},
|
||||
)
|
||||
|
||||
@app.exception_handler(RequestValidationError)
|
||||
@@ -103,7 +107,7 @@ def create_app() -> FastAPI:
|
||||
"request_id": request_id,
|
||||
}
|
||||
).model_dump(),
|
||||
headers={"X-Request-Id": request_id},
|
||||
headers={"X-Request-Id": request_id, "X-Instance-Id": instance_id},
|
||||
)
|
||||
|
||||
@app.exception_handler(PydanticValidationError)
|
||||
@@ -124,7 +128,7 @@ def create_app() -> FastAPI:
|
||||
"request_id": request_id,
|
||||
}
|
||||
).model_dump(),
|
||||
headers={"X-Request-Id": request_id},
|
||||
headers={"X-Request-Id": request_id, "X-Instance-Id": instance_id},
|
||||
)
|
||||
|
||||
@app.exception_handler(Exception)
|
||||
@@ -140,7 +144,7 @@ def create_app() -> FastAPI:
|
||||
"request_id": request_id,
|
||||
}
|
||||
).model_dump(),
|
||||
headers={"X-Request-Id": request_id},
|
||||
headers={"X-Request-Id": request_id, "X-Instance-Id": instance_id},
|
||||
)
|
||||
|
||||
# Подключаем роуты
|
||||
|
||||
@@ -96,6 +96,7 @@ class CreateMessage(BaseModel):
|
||||
model_config = ConfigDict(extra="forbid", strict=True)
|
||||
|
||||
text: str = Field(..., min_length=1, max_length=4000)
|
||||
attachment_ids: list[str] = Field(default_factory=list, max_length=0)
|
||||
|
||||
@field_validator("text")
|
||||
@classmethod
|
||||
|
||||
@@ -1,10 +1,11 @@
|
||||
from uuid import UUID
|
||||
import re
|
||||
|
||||
from fastapi import APIRouter, Depends, HTTPException, Request
|
||||
|
||||
from src.models import CreateMessage, Message, MessagePage
|
||||
from src.routes.common import get_request_id, make_error, require_user
|
||||
from src.storage import LimitExceeded, ValidationError, storage
|
||||
from src.storage import ConflictError, LimitExceeded, ValidationError, storage
|
||||
|
||||
router = APIRouter()
|
||||
|
||||
@@ -16,7 +17,7 @@ def create_message(
|
||||
body: CreateMessage,
|
||||
x_user_id: str = Depends(require_user),
|
||||
):
|
||||
"""Отправить сообщение в чат. Отправитель определяется по X-User-Id."""
|
||||
"""Отправить сообщение от владельца Bearer-сессии с общей защитой повторов."""
|
||||
request_id = get_request_id(request)
|
||||
|
||||
chat_id_str = str(chat_id)
|
||||
@@ -28,8 +29,13 @@ def create_message(
|
||||
)
|
||||
|
||||
try:
|
||||
msg = storage.create_message(chat_id_str, x_user_id, body.text)
|
||||
key = request.headers.get('Idempotency-Key', '')
|
||||
if not re.fullmatch(r'[A-Za-z0-9._:-]{1,128}', key):
|
||||
raise HTTPException(400, detail=make_error('invalid_request', 'неверный Idempotency-Key', request_id).model_dump())
|
||||
msg = storage.create_message(chat_id_str, x_user_id, body.text, key)
|
||||
return msg
|
||||
except ConflictError as e:
|
||||
raise HTTPException(409, detail=make_error('conflict', str(e), request_id).model_dump())
|
||||
except LimitExceeded as e:
|
||||
raise HTTPException(
|
||||
status_code=429,
|
||||
|
||||
+13
-2
@@ -50,7 +50,7 @@ def public_row(row):
|
||||
|
||||
class PostgresStorage:
|
||||
def __init__(self):
|
||||
self.pool = ConnectionPool(setting('DATABASE_URL', ''), min_size=1, max_size=10,
|
||||
self.pool = ConnectionPool(setting('DATABASE_URL', ''), min_size=1, max_size=int(os.getenv("POOL_SIZE", "10")),
|
||||
timeout=3, max_waiting=32, open=False, check=ConnectionPool.check_connection,
|
||||
kwargs={'row_factory': dict_row, 'connect_timeout': 3,
|
||||
'options': '-c statement_timeout=3000 -c lock_timeout=2000'})
|
||||
@@ -194,9 +194,20 @@ class PostgresStorage:
|
||||
next_cursor = self._encode_cursor('chats',user_id,page[-1].created_at,page[-1].id) if len(rows)>limit else None
|
||||
return page,next_cursor
|
||||
|
||||
def create_message(self, chat_id, sender_id, text):
|
||||
def create_message(self, chat_id, sender_id, text, key):
|
||||
# Блокировка сериализует один ключ на всех репликах; результат и сообщение атомарны.
|
||||
with self.pool.connection() as conn:
|
||||
scope = json.dumps([sender_id, chat_id, key])
|
||||
conn.execute('SELECT pg_advisory_xact_lock(hashtextextended(%s, 0))', (scope,))
|
||||
old = conn.execute('SELECT * FROM message_requests WHERE user_id=%s AND chat_id=%s AND key=%s AND expires_at>clock_timestamp()', (sender_id,chat_id,key)).fetchone()
|
||||
if old:
|
||||
if old['body'] != text:
|
||||
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))
|
||||
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']))
|
||||
return Message(**public_row(row))
|
||||
|
||||
def list_messages(self, chat_id, cursor, limit):
|
||||
|
||||
@@ -0,0 +1,37 @@
|
||||
"""Конкурентные и отрицательные проверки общей идемпотентности через LB."""
|
||||
from concurrent.futures import ThreadPoolExecutor
|
||||
from pathlib import Path
|
||||
import sys
|
||||
import uuid
|
||||
sys.path.insert(0, str(Path(__file__).resolve().parents[1] / 'tests'))
|
||||
from client import Client, check
|
||||
|
||||
c = Client()
|
||||
alice, bob, eve, chat = c.bootstrap()
|
||||
path = '/api/v1/chats/' + chat['id'] + '/messages'
|
||||
key = uuid.uuid4().hex
|
||||
|
||||
|
||||
def send(i):
|
||||
return Client().call('POST', path, 201, actor=alice,
|
||||
body={'text': 'Общий конкурентный ключ', **({'attachment_ids': []} if i % 2 else {})},
|
||||
headers={'Idempotency-Key': key}, schema='Message')
|
||||
|
||||
|
||||
with ThreadPoolExecutor(max_workers=16) as pool:
|
||||
results = list(pool.map(send, range(32)))
|
||||
check(len({r['json']['id'] for r in results}) == 1, 'повтор создал дубли')
|
||||
instances = {r['headers']['X-Instance-Id'] for r in results}
|
||||
check(len(instances) >= 2, 'не наблюдаются разные процессы')
|
||||
c.call('POST', path, 409, actor=alice, body={'text': 'Другой текст'}, headers={'Idempotency-Key': key})
|
||||
for invalid in ('', 'bad key', 'x' * 129, 'bad/key'):
|
||||
c.call('POST', path, 400, actor=alice, body={'text': 'Проверка'}, headers={'Idempotency-Key': invalid})
|
||||
c.call('POST', path, 404, actor=eve, body={'text': 'Проверка'}, headers={'Idempotency-Key': key})
|
||||
other = c.message(bob, chat, 'Независимый пользователь', key=key)['json']
|
||||
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)
|
||||
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, области ключа и отзыв сессии.')
|
||||
Reference in New Issue
Block a user