Добавил брокер и worker в compose-стенд

This commit is contained in:
gera
2026-11-06 01:59:07 +03:00
parent dfa8784afa
commit 60f0f2bf13
7 changed files with 425 additions and 14 deletions
+5 -14
View File
@@ -1,25 +1,16 @@
# Copy to .env for your LOCAL synthetic test environment; never commit .env.
# These are logical interface suggestions; map actual framework names in REPORT.md.
APP_HOST=0.0.0.0
APP_PORT=8080
APP_ENV=lab
SESSION_TTL_SECONDS=3600
# Choose credentials locally. File paths contain no secret values.
DATABASE_URL_FILE=/run/secrets/database_url
# Optional on 3, required use on 4 in lab2; Redis OR Valkey:
SESSION_STORE=postgres
CACHE_URL_FILE=/run/secrets/cache_url
API_REPLICAS=2
IDEMPOTENCY_TTL_SECONDS=86400
S3_ENDPOINT=http://s3:9000
API_REPLICAS=2
S3_REGION=us-east-1
S3_BUCKET=messenger-attachments
S3_ACCESS_KEY_ID_FILE=/run/secrets/s3_access_key_id
S3_SECRET_ACCESS_KEY_FILE=/run/secrets/s3_secret_access_key
MAX_UPLOAD_BYTES=10485760
MAX_IMAGE_PIXELS=40000000
BROKER_URL_FILE=/run/secrets/broker_url
CLEANUP_GRACE_SECONDS=600
CLEANUP_INTERVAL_SECONDS=300
WORKER_CONCURRENCY=2
JOB_MAX_ATTEMPTS=5
JOB_TIMEOUT_SECONDS=60
JOB_BACKOFF_BASE_MS=1000
JOB_BACKOFF_MAX_MS=30000
STAGING_RETENTION_SECONDS=86400
+321
View File
@@ -0,0 +1,321 @@
x-api-env: &api-env
APP_HOST: 0.0.0.0
APP_PORT: 8080
APP_ENV: ${APP_ENV:-lab}
SESSION_TTL_SECONDS: ${SESSION_TTL_SECONDS:-3600}
IDEMPOTENCY_TTL_SECONDS: ${IDEMPOTENCY_TTL_SECONDS:-86400}
SESSION_STORE: postgres
S3_ENDPOINT: http://s3:9000
S3_REGION: ${S3_REGION:-us-east-1}
S3_BUCKET: ${S3_BUCKET:-messenger-attachments}
S3_ACCESS_KEY_ID_FILE: /run/secrets/s3_access_key_id
S3_SECRET_ACCESS_KEY_FILE: /run/secrets/s3_secret_access_key
MAX_UPLOAD_BYTES: ${MAX_UPLOAD_BYTES:-10485760}
MAX_IMAGE_PIXELS: ${MAX_IMAGE_PIXELS:-40000000}
UPLOAD_CONCURRENCY: ${UPLOAD_CONCURRENCY:-10}
GOMEMLIMIT: 150MiB
SHUTDOWN_TIMEOUT_SECONDS: 10
DRAIN_SECONDS: 3
DATABASE_URL_FILE: /run/secrets/database_url
CACHE_URL_FILE: /run/secrets/cache_url
BROKER_URL_FILE: /run/secrets/broker_url
JOB_MAX_ATTEMPTS: ${JOB_MAX_ATTEMPTS:-5}
FAULT_POINT: ${API_FAULT_POINT:-}
services:
postgres:
image: postgres:17-alpine@sha256:b0f9560a2de083e2cc7382e75f808c7381a32852a7ec49117deedb300e552b24
environment:
POSTGRES_USER: messenger
POSTGRES_PASSWORD_FILE: /run/secrets/postgres_password
POSTGRES_DB: messenger
secrets:
- postgres_password
volumes:
- pg_data:/var/lib/postgresql/data
healthcheck:
test: ["CMD-SHELL", "pg_isready -U messenger -d messenger"]
interval: 5s
timeout: 3s
retries: 10
start_period: 5s
deploy:
resources:
limits:
cpus: "1.0"
memory: 512M
networks:
- backend
restart: unless-stopped
valkey:
image: valkey/valkey:8.1-alpine@sha256:081c2f5cb575efc901aa80ff9cdbd1ec6a301682fd35e1ebb4b0990a4a4a8507
command: ["valkey-server", "--appendonly", "yes", "--save", "60", "1"]
volumes:
- valkey_data:/data
healthcheck:
test: ["CMD", "valkey-cli", "ping"]
interval: 5s
timeout: 3s
retries: 10
start_period: 5s
deploy:
resources:
limits:
cpus: "0.5"
memory: 128M
networks:
- backend
restart: unless-stopped
broker:
image: valkey/valkey:8.1-alpine@sha256:081c2f5cb575efc901aa80ff9cdbd1ec6a301682fd35e1ebb4b0990a4a4a8507
command: ["valkey-server", "/run/secrets/broker_conf", "--appendonly", "yes", "--appendfsync", "always", "--maxmemory-policy", "noeviction"]
secrets:
- broker_conf
volumes:
- broker_data:/data
healthcheck:
test: ["CMD-SHELL", "valkey-cli --no-auth-warning -a \"$$(sed -n 's/^requirepass //p' /run/secrets/broker_conf)\" ping | grep -q PONG"]
interval: 5s
timeout: 3s
retries: 10
start_period: 5s
deploy:
resources:
limits:
cpus: "0.5"
memory: 128M
networks:
- backend
restart: unless-stopped
s3:
image: chrislusf/seaweedfs@sha256:c2658820e763294a9e9de7b36c81e59b879e3459148351aee4e31a126ca64860
command:
- server
- -dir=/data
- -ip=s3
- -master.volumeSizeLimitMB=128
- -volume.max=30
- -s3
- -s3.port=9000
- -s3.config=/run/secrets/s3_config
secrets:
- s3_config
volumes:
- s3_data:/data
healthcheck:
test: ["CMD-SHELL", "wget -qO- http://127.0.0.1:9333/dir/assign | grep -q fid"]
interval: 5s
timeout: 3s
retries: 12
start_period: 10s
deploy:
resources:
limits:
cpus: "1.0"
memory: 512M
networks:
- storage
restart: unless-stopped
s3-init:
image: mtusi-messenger:lab5
command: ["s3-init"]
environment:
S3_ENDPOINT: http://s3:9000
S3_REGION: ${S3_REGION:-us-east-1}
S3_BUCKET: ${S3_BUCKET:-messenger-attachments}
S3_ACCESS_KEY_ID_FILE: /run/secrets/s3_admin_access_key_id
S3_SECRET_ACCESS_KEY_FILE: /run/secrets/s3_admin_secret_access_key
secrets:
- s3_admin_access_key_id
- s3_admin_secret_access_key
depends_on:
s3:
condition: service_healthy
migrate:
condition: service_completed_successfully
deploy:
resources:
limits:
cpus: "0.5"
memory: 128M
networks:
- storage
restart: "no"
janitor:
image: mtusi-messenger:lab5
command: ["janitor"]
environment:
DATABASE_URL_FILE: /run/secrets/database_url
S3_ENDPOINT: http://s3:9000
S3_REGION: ${S3_REGION:-us-east-1}
S3_BUCKET: ${S3_BUCKET:-messenger-attachments}
S3_ACCESS_KEY_ID_FILE: /run/secrets/s3_access_key_id
S3_SECRET_ACCESS_KEY_FILE: /run/secrets/s3_secret_access_key
CLEANUP_GRACE_SECONDS: ${CLEANUP_GRACE_SECONDS:-600}
CLEANUP_INTERVAL_SECONDS: ${CLEANUP_INTERVAL_SECONDS:-300}
STAGING_RETENTION_SECONDS: ${STAGING_RETENTION_SECONDS:-86400}
secrets:
- database_url
- s3_access_key_id
- s3_secret_access_key
depends_on:
s3-init:
condition: service_completed_successfully
healthcheck:
disable: true
deploy:
resources:
limits:
cpus: "0.25"
memory: 64M
networks:
- backend
- storage
restart: unless-stopped
worker:
image: mtusi-messenger:lab5
command: ["worker"]
environment:
DATABASE_URL_FILE: /run/secrets/database_url
BROKER_URL_FILE: /run/secrets/broker_url
S3_ENDPOINT: http://s3:9000
S3_REGION: ${S3_REGION:-us-east-1}
S3_BUCKET: ${S3_BUCKET:-messenger-attachments}
S3_ACCESS_KEY_ID_FILE: /run/secrets/s3_access_key_id
S3_SECRET_ACCESS_KEY_FILE: /run/secrets/s3_secret_access_key
MAX_UPLOAD_BYTES: ${MAX_UPLOAD_BYTES:-10485760}
MAX_IMAGE_PIXELS: ${MAX_IMAGE_PIXELS:-40000000}
WORKER_CONCURRENCY: ${WORKER_CONCURRENCY:-2}
JOB_MAX_ATTEMPTS: ${JOB_MAX_ATTEMPTS:-5}
JOB_TIMEOUT_SECONDS: ${JOB_TIMEOUT_SECONDS:-60}
JOB_BACKOFF_BASE_MS: ${JOB_BACKOFF_BASE_MS:-1000}
JOB_BACKOFF_MAX_MS: ${JOB_BACKOFF_MAX_MS:-30000}
GOMEMLIMIT: 600MiB
FAULT_POINT: ${WORKER_FAULT_POINT:-}
secrets:
- database_url
- broker_url
- s3_access_key_id
- s3_secret_access_key
depends_on:
s3-init:
condition: service_completed_successfully
broker:
condition: service_healthy
healthcheck:
disable: true
stop_grace_period: 30s
deploy:
resources:
limits:
cpus: "1.0"
memory: 768M
networks:
- backend
- storage
restart: unless-stopped
migrate:
build: .
image: mtusi-messenger:lab5
command: ["migrate"]
environment:
DATABASE_URL_FILE: /run/secrets/database_url
secrets:
- database_url
depends_on:
postgres:
condition: service_healthy
deploy:
resources:
limits:
cpus: "0.5"
memory: 128M
networks:
- backend
restart: "no"
api:
image: mtusi-messenger:lab5
environment: *api-env
secrets:
- database_url
- cache_url
- broker_url
- s3_access_key_id
- s3_secret_access_key
depends_on:
s3-init:
condition: service_completed_successfully
valkey:
condition: service_healthy
broker:
condition: service_healthy
stop_grace_period: 15s
deploy:
replicas: ${API_REPLICAS:-2}
resources:
limits:
cpus: "0.5"
memory: 192M
networks:
- backend
- storage
restart: unless-stopped
lb:
image: haproxy:3.0-alpine@sha256:cf3af0facf7eb22b9fee463daf0fbc07ead740b8150696dce724264faf7b4318
ports:
- "127.0.0.1:8080:8080"
volumes:
- ./lb/haproxy.cfg:/usr/local/etc/haproxy/haproxy.cfg:ro
depends_on:
- api
deploy:
resources:
limits:
cpus: "0.5"
memory: 128M
networks:
- backend
restart: unless-stopped
secrets:
postgres_password:
file: ./secrets/postgres_password
database_url:
file: ./secrets/database_url
cache_url:
file: ./secrets/cache_url
broker_conf:
file: ./secrets/broker.conf
broker_url:
file: ./secrets/broker_url
s3_config:
file: ./secrets/s3_config.json
s3_admin_access_key_id:
file: ./secrets/s3_admin_access_key_id
s3_admin_secret_access_key:
file: ./secrets/s3_admin_secret_access_key
s3_access_key_id:
file: ./secrets/s3_access_key_id
s3_secret_access_key:
file: ./secrets/s3_secret_access_key
volumes:
pg_data:
valkey_data:
broker_data:
s3_data:
networks:
backend:
driver: bridge
storage:
driver: bridge
+38
View File
@@ -0,0 +1,38 @@
global
log stdout format raw local0
maxconn 2000
resolvers docker
nameserver dns 127.0.0.11:53
accepted_payload_size 8192
hold valid 1s
hold nx 1s
hold obsolete 1s
resolve_retries 3
timeout resolve 1s
timeout retry 1s
defaults
mode http
log global
option httplog
option redispatch 1
retries 3
retry-on conn-failure empty-response
timeout connect 1s
timeout client 20s
timeout server 15s
timeout http-request 10s
timeout queue 5s
frontend public
bind :8080
default_backend api
backend api
balance roundrobin
option httpchk
http-check send meth GET uri /health/ready
http-check expect status 200
default-server check inter 1s fastinter 500ms downinter 1s fall 2 rise 2 resolvers docker init-addr none on-marked-down shutdown-sessions
server-template api 1-8 api:8080
+28
View File
@@ -0,0 +1,28 @@
#!/bin/sh
set -eu
ROOT="$(CDPATH= cd -- "$(dirname "$0")/.." && pwd)"
mkdir -p "$ROOT/secrets"
cd "$ROOT/secrets"
gen() {
[ -f "$1" ] || openssl rand -hex "$2" | tr -d '\n' > "$1"
}
if [ ! -f postgres_password ]; then
openssl rand -base64 24 | tr -d '\n' > postgres_password
fi
PASS=$(cat postgres_password)
ENC=$(printf '%s' "$PASS" | python3 -c 'import sys,urllib.parse; print(urllib.parse.quote(sys.stdin.read(), safe=""))')
printf 'postgres://messenger:%s@postgres:5432/messenger?sslmode=disable\n' "$ENC" > database_url
printf 'redis://valkey:6379/0\n' > cache_url
gen broker_password 24
printf 'requirepass %s\n' "$(cat broker_password)" > broker.conf
printf 'redis://:%s@broker:6379/0\n' "$(cat broker_password)" > broker_url
gen s3_admin_access_key_id 8
gen s3_admin_secret_access_key 20
gen s3_access_key_id 8
gen s3_secret_access_key 20
BUCKET=$(grep -E '^S3_BUCKET=' "$ROOT/.env" 2>/dev/null | cut -d= -f2 || true)
BUCKET=${BUCKET:-messenger-attachments}
printf '{"identities":[{"name":"admin","credentials":[{"accessKey":"%s","secretKey":"%s"}],"actions":["Admin","Read","Write","List","Tagging"]},{"name":"api","credentials":[{"accessKey":"%s","secretKey":"%s"}],"actions":["Read:%s","Write:%s","List:%s"]}]}\n' \
"$(cat s3_admin_access_key_id)" "$(cat s3_admin_secret_access_key)" "$(cat s3_access_key_id)" "$(cat s3_secret_access_key)" "$BUCKET" "$BUCKET" "$BUCKET" > s3_config.json
chmod 644 ./*
echo "secrets ready in $ROOT/secrets"
+7
View File
@@ -0,0 +1,7 @@
#!/bin/sh
set -eu
ROOT="$(CDPATH= cd -- "$(dirname "$0")/.." && pwd)"
cd "$ROOT"
docker compose --env-file .env restart postgres valkey broker s3
docker compose --env-file .env up -d --wait postgres valkey broker s3
docker compose --env-file .env restart api lb janitor worker
+16
View File
@@ -0,0 +1,16 @@
#!/bin/sh
set -eu
ROOT="$(CDPATH= cd -- "$(dirname "$0")/.." && pwd)"
cd "$ROOT"
dc="docker compose --env-file .env"
old=$($dc ps -q api)
n=$(echo "$old" | wc -w)
$dc build migrate
$dc up -d --no-deps migrate janitor worker
$dc up -d --no-deps --no-recreate --scale api=$((n * 2)) api
$dc up -d --wait --no-deps --no-recreate --scale api=$((n * 2)) api
for c in $old; do
docker stop -t 10 "$c" >/dev/null
docker rm "$c" >/dev/null
done
$dc up -d --wait --no-deps --no-recreate --scale api=$n api
+10
View File
@@ -0,0 +1,10 @@
#!/bin/sh
set -eu
: "${TARGET_INSTANCE_ID:?}"
ROOT="$(CDPATH= cd -- "$(dirname "$0")/.." && pwd)"
cd "$ROOT"
id=$(docker compose --env-file .env ps -q api | while read -r c; do
case "$c" in "$TARGET_INSTANCE_ID"*) echo "$c";; esac
done)
[ -n "$id" ] || exit 1
docker stop -t 10 "$id" >/dev/null