变更内容: - 在 `Dockerfile` 和 `docker-compose.yml` 中添加 Worker 模式支持,包含运行模式 `RUN_MODE` 的配置。 - 更新 API 路由,改为将任务入队处理,并由 Worker 执行。 - 在 JobManager 中新增任务队列及分布式锁功能,支持任务的入队、出队、执行控制以及重试机制。 - 添加全局并发控制逻辑,避免任务超额运行。 - 扩展单元测试,覆盖任务队列、锁机制和并发控制的各类场景。 - 在 Serverless 配置中分别为 API 和 Worker 添加独立服务定义。 提升任务调度灵活性,增强系统可靠性与扩展性。
156 lines
3.8 KiB
YAML
156 lines
3.8 KiB
YAML
version: '3.8'
|
|
|
|
services:
|
|
app:
|
|
build:
|
|
context: ..
|
|
dockerfile: deployment/Dockerfile
|
|
ports:
|
|
- "8111:8000"
|
|
environment:
|
|
- APP_ENV=development
|
|
- LOG_LEVEL=INFO
|
|
- METRICS_ENABLED=true
|
|
- RUN_MODE=api
|
|
# Redis 指标存储配置
|
|
- REDIS_HOST=redis
|
|
- REDIS_PORT=6379
|
|
- REDIS_DB=0
|
|
# 指标配置文件路径
|
|
- METRICS_CONFIG_PATH=config/metrics.yaml
|
|
# 日志文件配置
|
|
- LOG_FILE_ENABLED=false
|
|
- LOG_FILE_PATH=/var/log/app/app.log
|
|
volumes:
|
|
- ../src:/app/src
|
|
- ../config:/app/config
|
|
- app_logs:/var/log/app
|
|
labels:
|
|
logging: "promtail"
|
|
logging_jobname: "functional-scaffold-app"
|
|
restart: unless-stopped
|
|
depends_on:
|
|
redis:
|
|
condition: service_healthy
|
|
healthcheck:
|
|
test: ["CMD", "python", "-c", "import urllib.request; urllib.request.urlopen('http://localhost:8000/healthz')"]
|
|
interval: 30s
|
|
timeout: 3s
|
|
retries: 3
|
|
start_period: 5s
|
|
|
|
# Worker 服务 - 处理异步任务
|
|
worker:
|
|
build:
|
|
context: ..
|
|
dockerfile: deployment/Dockerfile
|
|
environment:
|
|
- APP_ENV=development
|
|
- LOG_LEVEL=INFO
|
|
- METRICS_ENABLED=true
|
|
- RUN_MODE=worker
|
|
# Redis 配置
|
|
- REDIS_HOST=redis
|
|
- REDIS_PORT=6379
|
|
- REDIS_DB=0
|
|
# Worker 配置
|
|
- WORKER_POLL_INTERVAL=1.0
|
|
- MAX_CONCURRENT_JOBS=10
|
|
- JOB_MAX_RETRIES=3
|
|
- JOB_EXECUTION_TIMEOUT=300
|
|
volumes:
|
|
- ../src:/app/src
|
|
- ../config:/app/config
|
|
labels:
|
|
logging: "promtail"
|
|
logging_jobname: "functional-scaffold-worker"
|
|
restart: unless-stopped
|
|
depends_on:
|
|
redis:
|
|
condition: service_healthy
|
|
deploy:
|
|
replicas: 2
|
|
|
|
# Redis - 用于集中式指标存储
|
|
redis:
|
|
image: redis:7-alpine
|
|
ports:
|
|
- "6380:6379"
|
|
volumes:
|
|
- redis_data:/data
|
|
command: redis-server --appendonly yes
|
|
restart: unless-stopped
|
|
healthcheck:
|
|
test: ["CMD", "redis-cli", "ping"]
|
|
interval: 10s
|
|
timeout: 3s
|
|
retries: 3
|
|
|
|
prometheus:
|
|
image: prom/prometheus:latest
|
|
ports:
|
|
- "9090:9090"
|
|
volumes:
|
|
- ../monitoring/prometheus.yml:/etc/prometheus/prometheus.yml
|
|
- ../monitoring/alerts:/etc/prometheus/rules
|
|
- prometheus_data:/prometheus
|
|
command:
|
|
- '--config.file=/etc/prometheus/prometheus.yml'
|
|
- '--storage.tsdb.path=/prometheus'
|
|
restart: unless-stopped
|
|
depends_on:
|
|
- app
|
|
|
|
grafana:
|
|
image: grafana/grafana:latest
|
|
ports:
|
|
- "3000:3000"
|
|
environment:
|
|
- GF_SECURITY_ADMIN_PASSWORD=admin
|
|
volumes:
|
|
- grafana_data:/var/lib/grafana
|
|
- ../monitoring/grafana/datasources:/etc/grafana/provisioning/datasources
|
|
- ../monitoring/grafana/dashboards:/etc/grafana/provisioning/dashboards
|
|
restart: unless-stopped
|
|
depends_on:
|
|
- prometheus
|
|
- loki
|
|
|
|
loki:
|
|
image: grafana/loki:2.9.3
|
|
ports:
|
|
- "3100:3100"
|
|
volumes:
|
|
- ../monitoring/loki.yaml:/etc/loki/local-config.yaml
|
|
- loki_data:/loki
|
|
command: -config.file=/etc/loki/local-config.yaml
|
|
restart: unless-stopped
|
|
healthcheck:
|
|
test: ["CMD", "wget", "--spider", "-q", "http://localhost:3100/ready"]
|
|
interval: 10s
|
|
timeout: 3s
|
|
retries: 3
|
|
|
|
promtail:
|
|
ports:
|
|
- "9080:9080"
|
|
image: grafana/promtail:3.0.0
|
|
volumes:
|
|
- ../monitoring/promtail.yaml:/etc/promtail/config.yml
|
|
# Docker stdio 收集
|
|
- /var/lib/docker/containers:/var/lib/docker/containers:ro
|
|
- /var/run/docker.sock:/var/run/docker.sock:ro
|
|
# Log 文件收集(备用)
|
|
- app_logs:/var/log/app:ro
|
|
command: -config.file=/etc/promtail/config.yml
|
|
restart: unless-stopped
|
|
depends_on:
|
|
- loki
|
|
|
|
volumes:
|
|
prometheus_data:
|
|
grafana_data:
|
|
redis_data:
|
|
loki_data:
|
|
app_logs:
|