完善外部生成Worker动态扩缩容
新增外部生成controller进程角色与systemd服务 补齐队列统计procedure与spacetime-client绑定 更新生产部署脚本、健康巡检和server provision的worker/controller口径 新增容器worker smoke脚本并同步运维文档与团队记忆
This commit is contained in:
@@ -22,6 +22,7 @@ tmp
|
|||||||
.env.secrets.*
|
.env.secrets.*
|
||||||
spacetime.local.json
|
spacetime.local.json
|
||||||
deploy/container/api-server.env
|
deploy/container/api-server.env
|
||||||
|
deploy/container/worker-smoke
|
||||||
|
|
||||||
server-rs/target
|
server-rs/target
|
||||||
server-rs/target-*
|
server-rs/target-*
|
||||||
|
|||||||
@@ -42,6 +42,7 @@ temp*build*/
|
|||||||
.env.secrets.local
|
.env.secrets.local
|
||||||
spacetime.local.json
|
spacetime.local.json
|
||||||
deploy/container/api-server.env
|
deploy/container/api-server.env
|
||||||
|
deploy/container/worker-smoke/
|
||||||
|
|
||||||
# Local load-test data extracted from private migration files
|
# Local load-test data extracted from private migration files
|
||||||
scripts/loadtest/data/*.local.json
|
scripts/loadtest/data/*.local.json
|
||||||
|
|||||||
@@ -174,7 +174,8 @@
|
|||||||
- 背景:拼图首图、图集、音频等外部生成链路长期占用 `api-server` HTTP handler,导致扩容只能放大 API 进程,且 HTTP 超时和外部 provider 波动会直接影响创作入口。
|
- 背景:拼图首图、图集、音频等外部生成链路长期占用 `api-server` HTTP handler,导致扩容只能放大 API 进程,且 HTTP 超时和外部 provider 波动会直接影响创作入口。
|
||||||
- 决策:外部生成任务统一进入 SpacetimeDB `external_generation_job` 持久队列,由 `api-server` 的 `external-generation-worker` 进程角色 claim lease 后执行;HTTP 角色只做鉴权、表单/状态初始化、入队和返回 `queued/running/completed/failed` 操作状态。生产通过 systemd worker 模板增加实例数或提高 `GENARRATIVE_EXTERNAL_GENERATION_WORKER_CONCURRENCY` 动态扩缩容,`GENARRATIVE_PROCESS_ROLE=all` 仅用于本地 smoke。拼图 `compile_puzzle_draft`、结果页 `generate_puzzle_images` 与 `generate_puzzle_ui_background` 已接入 worker;业务写回必须在 SpacetimeDB transaction 内校验 `external_generation_job` 的 `job_id + worker_id + lease_token`、job kind、owner 和 source entity,其中首图 worker 的前置 `compile_puzzle_agent_draft` 也必须带 guard。worker 核心业务写回失败不能返回内存快照并把 job 标成 completed;失败态业务写回成功后才能把 job 标成 failed,失败态未写回则保留租约等待后续重领。拼图业务失败不自动重试,只保留 lease 过期后的崩溃重领,避免钱包扣退费幂等漂移。生产发布会启用默认 `genarrative-external-generation-worker@1.service` 并等待 worker active,worker 停机时停止 claim 新任务并 drain 当前任务。
|
- 决策:外部生成任务统一进入 SpacetimeDB `external_generation_job` 持久队列,由 `api-server` 的 `external-generation-worker` 进程角色 claim lease 后执行;HTTP 角色只做鉴权、表单/状态初始化、入队和返回 `queued/running/completed/failed` 操作状态。生产通过 systemd worker 模板增加实例数或提高 `GENARRATIVE_EXTERNAL_GENERATION_WORKER_CONCURRENCY` 动态扩缩容,`GENARRATIVE_PROCESS_ROLE=all` 仅用于本地 smoke。拼图 `compile_puzzle_draft`、结果页 `generate_puzzle_images` 与 `generate_puzzle_ui_background` 已接入 worker;业务写回必须在 SpacetimeDB transaction 内校验 `external_generation_job` 的 `job_id + worker_id + lease_token`、job kind、owner 和 source entity,其中首图 worker 的前置 `compile_puzzle_agent_draft` 也必须带 guard。worker 核心业务写回失败不能返回内存快照并把 job 标成 completed;失败态业务写回成功后才能把 job 标成 failed,失败态未写回则保留租约等待后续重领。拼图业务失败不自动重试,只保留 lease 过期后的崩溃重领,避免钱包扣退费幂等漂移。生产发布会启用默认 `genarrative-external-generation-worker@1.service` 并等待 worker active,worker 停机时停止 claim 新任务并 drain 当前任务。
|
||||||
- 2026-06-07 追加:`GENARRATIVE_EXTERNAL_GENERATION_MODE` 使用 `queue|inline` 显式策略;生产和容器扩缩容验证保持 `queue`。本地开发若需要同步等待结果,应通过 `.env.local` 或本机环境显式配置为 `inline`,由 HTTP handler 复用同一 worker executor 直接返回 `completed`,不创建 `external_generation_job`,不支持 worker 动态扩缩容;脚本不得硬编码该策略。拼图写回 guard 字段改为可选,queue 路径仍必须完整校验 `job_id + worker_id + lease_token`;inline 路径只允许三项同时为空,半空 guard 仍拒绝。
|
- 2026-06-07 追加:`GENARRATIVE_EXTERNAL_GENERATION_MODE` 使用 `queue|inline` 显式策略;生产和容器扩缩容验证保持 `queue`。本地开发若需要同步等待结果,应通过 `.env.local` 或本机环境显式配置为 `inline`,由 HTTP handler 复用同一 worker executor 直接返回 `completed`,不创建 `external_generation_job`,不支持 worker 动态扩缩容;脚本不得硬编码该策略。拼图写回 guard 字段改为可选,queue 路径仍必须完整校验 `job_id + worker_id + lease_token`;inline 路径只允许三项同时为空,半空 guard 仍拒绝。
|
||||||
- 影响范围:`server-rs/crates/spacetime-module/src/external_generation.rs`、`server-rs/crates/spacetime-client/src/external_generation.rs`、`server-rs/crates/api-server/src/external_generation_worker.rs`、`deploy/systemd/genarrative-external-generation-worker@.service`、`scripts/deploy/production-api-deploy.sh`、`scripts/jenkins-server-provision.sh`、拼图 `compile_puzzle_draft`、拼图 `generate_puzzle_images`、拼图 `generate_puzzle_ui_background`、生产 env 模板和运维文档。
|
- 2026-06-11 追加:生产新增固定 `external-generation-controller` 进程角色和 `genarrative-external-generation-controller.service`。controller 只读取 `get_external_generation_queue_stats_and_return` 队列统计并管理 `genarrative-external-generation-worker@N.service`,不监听 HTTP、不执行外部生成任务;默认保留 `@1`,按 `claimable_pending + running_active + expired_running` 计算目标实例数,上限由 `GENARRATIVE_EXTERNAL_GENERATION_CONTROLLER_MAX_WORKERS` 控制,缩容需要连续空闲轮数且每轮只停最高编号一个实例。
|
||||||
|
- 影响范围:`server-rs/crates/spacetime-module/src/external_generation.rs`、`server-rs/crates/spacetime-client/src/external_generation.rs`、`server-rs/crates/api-server/src/external_generation_worker.rs`、`server-rs/crates/api-server/src/external_generation_worker_controller.rs`、`deploy/systemd/genarrative-external-generation-worker@.service`、`deploy/systemd/genarrative-external-generation-controller.service`、`deploy/env/external-generation-controller.env.example`、`scripts/deploy/production-api-deploy.sh`、`scripts/jenkins-server-provision.sh`、拼图 `compile_puzzle_draft`、拼图 `generate_puzzle_images`、拼图 `generate_puzzle_ui_background`、生产 env 模板和运维文档。
|
||||||
- 验证方式:`npm run spacetime:generate`、`npm run check:spacetime-schema`、`npm run check:server-rs-ddd`、`cargo check -p api-server --manifest-path server-rs/Cargo.toml`,并在 queue 模式下用 `GENARRATIVE_PROCESS_ROLE=all npm run dev` smoke 至少一次 queued -> worker 完成链路;本地 inline 排查只确认不创建 `external_generation_job`。
|
- 验证方式:`npm run spacetime:generate`、`npm run check:spacetime-schema`、`npm run check:server-rs-ddd`、`cargo check -p api-server --manifest-path server-rs/Cargo.toml`,并在 queue 模式下用 `GENARRATIVE_PROCESS_ROLE=all npm run dev` smoke 至少一次 queued -> worker 完成链路;本地 inline 排查只确认不创建 `external_generation_job`。
|
||||||
- 关联文档:`docs/technical/【后端架构】外部生成Worker化方案-2026-06-03.md`、`docs/【开发运维】本地开发验证与生产运维-2026-05-15.md`、`docs/【后端架构】server-rs与SpacetimeDB数据契约-2026-05-15.md`。
|
- 关联文档:`docs/technical/【后端架构】外部生成Worker化方案-2026-06-03.md`、`docs/【开发运维】本地开发验证与生产运维-2026-05-15.md`、`docs/【后端架构】server-rs与SpacetimeDB数据契约-2026-05-15.md`。
|
||||||
|
|
||||||
|
|||||||
@@ -120,6 +120,16 @@ npm run server-manager:panel
|
|||||||
npm run dev:spacetime:logs
|
npm run dev:spacetime:logs
|
||||||
```
|
```
|
||||||
|
|
||||||
|
本机隔离验证外部生成 worker 队列、API-only 更新和 worker 动态扩缩容时,优先使用:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
npm run container:worker-smoke -- smoke
|
||||||
|
```
|
||||||
|
|
||||||
|
该命令生成 `deploy/container/worker-smoke/` 下的 gitignored env 与端口 state,启动独立 compose project 和独立 SpacetimeDB,用 unsupported job 验证 worker claim / fail 回写;排查时用 `api-update` 确认 API 重建不触碰 worker,用 `scale <n>` 调整 worker 数量。
|
||||||
|
`external_generation_job` 是 private table,worker-smoke 通过 worker 日志里的 job_id 和 unsupported 记录确认消费,不通过 CLI SQL 查询队列表。
|
||||||
|
worker-smoke 默认把本机 `spacetime` CLI 打成轻量 SpacetimeDB 镜像,避免首次 smoke 依赖官方大镜像下载。若容器内 Cargo 下载依赖不稳定,追加 `--local-binary`,让容器内 Cargo 复用本机 Cargo 缓存构建当前 `api-server` 二进制,并把产物放进 Debian bookworm smoke runtime;可用 `GENARRATIVE_WORKER_SMOKE_LOCAL_BASE_IMAGE` 覆盖运行时基础镜像;隔离端口或库数据需要重建时追加 `--force`。
|
||||||
|
|
||||||
后台管理前端:
|
后台管理前端:
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
|
|||||||
@@ -27,9 +27,9 @@
|
|||||||
|
|
||||||
- 现象:拼图首关生成接口返回 `queued`,但生成页长时间不完成,重启 `genarrative-api.service` 也没有推进任务。
|
- 现象:拼图首关生成接口返回 `queued`,但生成页长时间不完成,重启 `genarrative-api.service` 也没有推进任务。
|
||||||
- 原因:HTTP 角色只入队,不再直接调用外部 provider;如果没有运行 `GENARRATIVE_PROCESS_ROLE=external-generation-worker` 或 `all` 的进程,`external_generation_job` 会停留在 `pending/running`,直到有 worker claim。
|
- 原因:HTTP 角色只入队,不再直接调用外部 provider;如果没有运行 `GENARRATIVE_PROCESS_ROLE=external-generation-worker` 或 `all` 的进程,`external_generation_job` 会停留在 `pending/running`,直到有 worker claim。
|
||||||
- 处理:生产用 `systemctl enable --now genarrative-external-generation-worker@1.service` 启动至少一个 worker;首次 API deploy 会在默认 worker pattern 下自动启用并启动 `@1`,并等待 worker active。扩容继续启动 `@2.service` 等实例,缩容停止多余实例;worker 收到停机信号后会停止 claim 新任务并等待当前任务完成。本地 smoke 可临时用 `GENARRATIVE_PROCESS_ROLE=all npm run dev`;本地若只想同步排查可通过 `.env.local` 或本机环境设置 `GENARRATIVE_EXTERNAL_GENERATION_MODE=inline`,但这不会创建 job,也不能验证 worker 扩缩容。
|
- 处理:生产用 `systemctl enable --now genarrative-external-generation-worker@1.service genarrative-external-generation-controller.service` 启动保底 worker 和 controller;首次 API deploy 会在默认 worker pattern 下自动启用并启动 `@1`、等待 worker active,并重启验活 controller。扩容默认交给 controller 按队列统计启动 `@2.service` 等实例,手动扩缩容只作为兜底;worker 收到停机信号后会停止 claim 新任务并等待当前任务完成。本地 smoke 可临时用 `GENARRATIVE_PROCESS_ROLE=all npm run dev`;本地若只想同步排查可通过 `.env.local` 或本机环境设置 `GENARRATIVE_EXTERNAL_GENERATION_MODE=inline`,但这不会创建 job,也不能验证 worker 扩缩容。
|
||||||
- 验证:`systemctl status 'genarrative-external-generation-worker@*.service'` 能看到 worker 实例;queue 模式下任务被 claim 后 `worker_id` 与 `lease_expires_at` 会更新,完成后 session 进入 ready 或 failed;inline 模式下不应产生新的 `external_generation_job`。
|
- 验证:`systemctl status genarrative-external-generation-controller.service 'genarrative-external-generation-worker@*.service'` 能看到 controller 和 worker 实例;queue 模式下任务被 claim 后 `worker_id` 与 `lease_expires_at` 会更新,完成后 session 进入 ready 或 failed;inline 模式下不应产生新的 `external_generation_job`。
|
||||||
- 关联:`deploy/systemd/genarrative-external-generation-worker@.service`、`deploy/env/external-generation-worker.env.example`、`server-rs/crates/spacetime-module/src/external_generation.rs`、`docs/【开发运维】本地开发验证与生产运维-2026-05-15.md`。
|
- 关联:`deploy/systemd/genarrative-external-generation-worker@.service`、`deploy/systemd/genarrative-external-generation-controller.service`、`deploy/env/external-generation-controller.env.example`、`server-rs/crates/spacetime-module/src/external_generation.rs`、`docs/【开发运维】本地开发验证与生产运维-2026-05-15.md`。
|
||||||
|
|
||||||
## 外部生成 worker 业务写回必须同事务校验 lease guard
|
## 外部生成 worker 业务写回必须同事务校验 lease guard
|
||||||
|
|
||||||
|
|||||||
@@ -97,6 +97,64 @@ npm run container:up -- --scale external-generation-worker=1 external-generation
|
|||||||
|
|
||||||
动态扩缩容验证必须保持 `GENARRATIVE_EXTERNAL_GENERATION_MODE=queue`;`inline` 模式下生成请求由 `api-server` 同步执行,不会被这些 worker 实例消费。
|
动态扩缩容验证必须保持 `GENARRATIVE_EXTERNAL_GENERATION_MODE=queue`;`inline` 模式下生成请求由 `api-server` 同步执行,不会被这些 worker 实例消费。
|
||||||
|
|
||||||
|
### 外部生成 Worker 隔离 Smoke
|
||||||
|
|
||||||
|
如果只想在本机隔离验证 worker 模式,不复用 `deploy/container/api-server.env`,使用专用脚本:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
npm run container:worker-smoke -- smoke
|
||||||
|
```
|
||||||
|
|
||||||
|
该脚本会生成 gitignored 的 `deploy/container/worker-smoke/api-server.env` 与端口 state,使用独立 compose project、独立 SpacetimeDB 数据卷和独立 host 端口,完成 `build -> up-spacetime -> publish -> up -> enqueue -> api-update -> enqueue`。测试 job 使用 `worker_smoke_unsupported` 类型,不访问真实 VectorEngine、LLM 或 OSS;预期结果是 worker 领取队列任务后按“不支持的任务类型”执行失败分支,从而验证队列 claim、lease、失败回写路径和 API / worker 进程隔离。`external_generation_job` 是 private table,脚本通过 worker 日志里的 job_id 和 unsupported 记录确认消费,不通过 CLI SQL 绕过权限。`smoke` 默认只启动 `api-server` 与 `external-generation-worker`,避免无关前端 / Nginx 镜像构建;需要同时验证 Nginx 时可分步执行 `up --with-nginx`。
|
||||||
|
|
||||||
|
分步排查时可执行:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
npm run container:worker-smoke -- init --force
|
||||||
|
npm run container:worker-smoke -- build
|
||||||
|
npm run container:worker-smoke -- up-spacetime
|
||||||
|
npm run container:worker-smoke -- publish
|
||||||
|
npm run container:worker-smoke -- up
|
||||||
|
npm run container:worker-smoke -- enqueue before-update
|
||||||
|
npm run container:worker-smoke -- api-update
|
||||||
|
npm run container:worker-smoke -- enqueue after-update
|
||||||
|
npm run container:worker-smoke -- status
|
||||||
|
```
|
||||||
|
|
||||||
|
如果隔离端口或库数据需要重置:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
npm run container:worker-smoke -- smoke --force
|
||||||
|
```
|
||||||
|
|
||||||
|
`container:worker-smoke` 默认会把本机 `spacetime` 2.4.1 CLI 打成轻量 SpacetimeDB 镜像,避免首次 smoke 必须拉取官方大镜像;普通 `npm run container:*` 压测仍默认使用 `clockworklabs/spacetime:v2.4.1`。如果 Docker build 阶段在容器内拉取 crates.io 依赖不稳定,可让容器内 Cargo 复用本机 Cargo 缓存构建当前二进制,再打入临时 smoke 镜像。该模式默认使用 `rust:1.93-bookworm` 作为 builder、Debian bookworm smoke runtime 承载构建产物;需要换 builder 镜像时设置 `GENARRATIVE_WORKER_SMOKE_CARGO_IMAGE`,需要换运行时基础镜像时设置 `GENARRATIVE_WORKER_SMOKE_LOCAL_BASE_IMAGE`:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
npm run container:worker-smoke -- smoke --local-binary
|
||||||
|
```
|
||||||
|
|
||||||
|
`api-update` 只会 `--force-recreate api-server`,并校验 `external-generation-worker` 容器 ID 不变;如要同时重建 API 镜像,使用:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
npm run container:worker-smoke -- api-update --build
|
||||||
|
```
|
||||||
|
|
||||||
|
验证 worker 动态扩缩容:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
npm run container:worker-smoke -- scale 3
|
||||||
|
npm run container:worker-smoke -- ps
|
||||||
|
npm run container:worker-smoke -- enqueue scaled-workers
|
||||||
|
npm run container:worker-smoke -- scale 1
|
||||||
|
```
|
||||||
|
|
||||||
|
查看或清理隔离环境:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
npm run container:worker-smoke -- logs external-generation-worker
|
||||||
|
npm run container:worker-smoke -- down -v
|
||||||
|
```
|
||||||
|
|
||||||
停止:
|
停止:
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ name: genarrative-container-loadtest
|
|||||||
|
|
||||||
services:
|
services:
|
||||||
spacetimedb:
|
spacetimedb:
|
||||||
image: clockworklabs/spacetime:v2.4.1
|
image: ${GENARRATIVE_CONTAINER_SPACETIME_IMAGE:-clockworklabs/spacetime:v2.4.1}
|
||||||
user: root
|
user: root
|
||||||
command:
|
command:
|
||||||
[
|
[
|
||||||
@@ -44,7 +44,7 @@ services:
|
|||||||
cpus: "2.0"
|
cpus: "2.0"
|
||||||
mem_limit: 1g
|
mem_limit: 1g
|
||||||
env_file:
|
env_file:
|
||||||
- ./api-server.env
|
- ${GENARRATIVE_CONTAINER_API_ENV_FILE:-./api-server.env}
|
||||||
environment:
|
environment:
|
||||||
GENARRATIVE_API_HOST: 0.0.0.0
|
GENARRATIVE_API_HOST: 0.0.0.0
|
||||||
GENARRATIVE_API_PORT: 8082
|
GENARRATIVE_API_PORT: 8082
|
||||||
@@ -77,7 +77,7 @@ services:
|
|||||||
cpus: "2.0"
|
cpus: "2.0"
|
||||||
mem_limit: 1g
|
mem_limit: 1g
|
||||||
env_file:
|
env_file:
|
||||||
- ./api-server.env
|
- ${GENARRATIVE_CONTAINER_API_ENV_FILE:-./api-server.env}
|
||||||
environment:
|
environment:
|
||||||
GENARRATIVE_PROCESS_ROLE: external-generation-worker
|
GENARRATIVE_PROCESS_ROLE: external-generation-worker
|
||||||
GENARRATIVE_TRACKING_OUTBOX_DIR: /var/lib/genarrative/tracking-outbox-worker
|
GENARRATIVE_TRACKING_OUTBOX_DIR: /var/lib/genarrative/tracking-outbox-worker
|
||||||
|
|||||||
@@ -0,0 +1,13 @@
|
|||||||
|
# 复制到 /etc/genarrative/external-generation-controller.env 后按机器容量调整。
|
||||||
|
# controller 只管理 systemd worker 实例;SpacetimeDB、外部 provider 密钥继续复用 api-server.env。
|
||||||
|
# systemd unit 会强制设置 GENARRATIVE_PROCESS_ROLE=external-generation-controller。
|
||||||
|
|
||||||
|
GENARRATIVE_EXTERNAL_GENERATION_CONTROLLER_MIN_WORKERS=1
|
||||||
|
GENARRATIVE_EXTERNAL_GENERATION_CONTROLLER_MAX_WORKERS=8
|
||||||
|
GENARRATIVE_EXTERNAL_GENERATION_CONTROLLER_TARGET_JOBS_PER_WORKER=2
|
||||||
|
GENARRATIVE_EXTERNAL_GENERATION_CONTROLLER_POLL_INTERVAL_MS=10000
|
||||||
|
GENARRATIVE_EXTERNAL_GENERATION_CONTROLLER_SCALE_DOWN_IDLE_ROUNDS=6
|
||||||
|
GENARRATIVE_EXTERNAL_GENERATION_CONTROLLER_SERVICE_TEMPLATE=genarrative-external-generation-worker@{}.service
|
||||||
|
GENARRATIVE_EXTERNAL_GENERATION_CONTROLLER_DRY_RUN=false
|
||||||
|
GENARRATIVE_API_LOG=info,tower_http=info
|
||||||
|
OTEL_SERVICE_NAME=genarrative-external-generation-controller
|
||||||
@@ -0,0 +1,27 @@
|
|||||||
|
[Unit]
|
||||||
|
Description=Genarrative External Generation Worker Controller
|
||||||
|
After=network-online.target spacetimedb.service
|
||||||
|
Wants=network-online.target
|
||||||
|
Requires=spacetimedb.service
|
||||||
|
|
||||||
|
[Service]
|
||||||
|
Type=simple
|
||||||
|
WorkingDirectory=/opt/genarrative/current
|
||||||
|
EnvironmentFile=/etc/genarrative/api-server.env
|
||||||
|
EnvironmentFile=-/etc/genarrative/external-generation-controller.env
|
||||||
|
ExecStart=/usr/bin/env GENARRATIVE_PROCESS_ROLE=external-generation-controller GENARRATIVE_TRACKING_OUTBOX_DIR=/var/lib/genarrative/tracking-outbox/controller OTEL_SERVICE_NAME=genarrative-external-generation-controller /opt/genarrative/current/api-server
|
||||||
|
Restart=always
|
||||||
|
RestartSec=5
|
||||||
|
KillSignal=SIGINT
|
||||||
|
TimeoutStopSec=120
|
||||||
|
LimitNOFILE=65535
|
||||||
|
TasksMax=512
|
||||||
|
|
||||||
|
# controller 需要调用 systemctl 管理 worker@N 实例,因此不降为 genarrative 用户。
|
||||||
|
# 它只复用 api-server 发布包和 SpacetimeDB 配置,不直接执行外部生成任务。
|
||||||
|
PrivateTmp=true
|
||||||
|
ProtectSystem=full
|
||||||
|
ReadWritePaths=/opt/genarrative /var/lib/genarrative
|
||||||
|
|
||||||
|
[Install]
|
||||||
|
WantedBy=multi-user.target
|
||||||
@@ -24,6 +24,7 @@
|
|||||||
- `renew_external_generation_job_lease_and_return`:worker 长任务执行期间按 `worker_id + lease_token` 续租,防止外部生成超过单次 lease 后被重复领取。
|
- `renew_external_generation_job_lease_and_return`:worker 长任务执行期间按 `worker_id + lease_token` 续租,防止外部生成超过单次 lease 后被重复领取。
|
||||||
- `complete_external_generation_job_and_return`:worker 成功后按 `worker_id + lease_token` 写入 `result_payload_json`,任务进入 `completed`。
|
- `complete_external_generation_job_and_return`:worker 成功后按 `worker_id + lease_token` 写入 `result_payload_json`,任务进入 `completed`。
|
||||||
- `fail_external_generation_job_and_return`:worker 失败后按 `worker_id + lease_token` 回写错误,并按 `max_attempts` 决定回到 `pending` 重试或进入 `failed`。
|
- `fail_external_generation_job_and_return`:worker 失败后按 `worker_id + lease_token` 回写错误,并按 `max_attempts` 决定回到 `pending` 重试或进入 `failed`。
|
||||||
|
- `get_external_generation_queue_stats_and_return`:controller 读取队列积压、运行中任务和过期 lease 数量,用于计算 worker 目标实例数;该 procedure 只读 `external_generation_job`,不直接操作 systemd。
|
||||||
|
|
||||||
这个 Module 的 **Seam** 在 SpacetimeDB procedure + `spacetime-client` facade;`api-server` HTTP role 和 worker role 都只依赖这个 Interface。外部 provider、OSS、计费补偿、玩法草稿回写仍留在 `api-server` worker implementation 内,不进入 SpacetimeDB reducer。
|
这个 Module 的 **Seam** 在 SpacetimeDB procedure + `spacetime-client` facade;`api-server` HTTP role 和 worker role 都只依赖这个 Interface。外部 provider、OSS、计费补偿、玩法草稿回写仍留在 `api-server` worker implementation 内,不进入 SpacetimeDB reducer。
|
||||||
|
|
||||||
@@ -82,6 +83,7 @@ pending/running -> cancelled (预留)
|
|||||||
|
|
||||||
- `api`:只启动 HTTP server。
|
- `api`:只启动 HTTP server。
|
||||||
- `external-generation-worker`:只启动外部生成 worker,不监听 HTTP。
|
- `external-generation-worker`:只启动外部生成 worker,不监听 HTTP。
|
||||||
|
- `external-generation-controller`:只启动 worker controller,不监听 HTTP,也不直接执行外部生成任务。
|
||||||
- `all`:本地开发可同时启动 HTTP 与 worker。
|
- `all`:本地开发可同时启动 HTTP 与 worker。
|
||||||
|
|
||||||
worker 配置:
|
worker 配置:
|
||||||
@@ -91,7 +93,17 @@ worker 配置:
|
|||||||
- `GENARRATIVE_EXTERNAL_GENERATION_WORKER_POLL_INTERVAL_MS`:空队列轮询间隔。
|
- `GENARRATIVE_EXTERNAL_GENERATION_WORKER_POLL_INTERVAL_MS`:空队列轮询间隔。
|
||||||
- `GENARRATIVE_EXTERNAL_GENERATION_WORKER_LEASE_SECONDS`:任务 lease 时长;worker 会按约三分之一 lease、最长 30 秒的间隔续租。该值应覆盖一次心跳网络抖动窗口,不需要大于完整外部生成链路耗时。
|
- `GENARRATIVE_EXTERNAL_GENERATION_WORKER_LEASE_SECONDS`:任务 lease 时长;worker 会按约三分之一 lease、最长 30 秒的间隔续租。该值应覆盖一次心跳网络抖动窗口,不需要大于完整外部生成链路耗时。
|
||||||
|
|
||||||
动态缩扩容方式:生产通过 `deploy/systemd/genarrative-external-generation-worker@.service` 或进程管理器启动更多 `external-generation-worker` 实例;无需改变 HTTP 进程数。缩容或发布重启 worker 时,进程收到 SIGINT/SIGTERM 后会停止 claim 新任务并等待当前任务完成;若进程被硬杀、机器断电或超过 systemd `TimeoutStopSec`,未完成任务会在 lease 过期后被其它 worker 重新领取。容器链路已有独立 `external-generation-worker` compose service;扩 worker 必须扩这个 worker service,不能只扩 `api-server` HTTP service。
|
controller 配置:
|
||||||
|
|
||||||
|
- `GENARRATIVE_EXTERNAL_GENERATION_CONTROLLER_MIN_WORKERS`:保底 worker 实例数,生产默认 `1`,controller 不会主动停止 `@1`。
|
||||||
|
- `GENARRATIVE_EXTERNAL_GENERATION_CONTROLLER_MAX_WORKERS`:自动扩容上限,生产模板默认 `8`。
|
||||||
|
- `GENARRATIVE_EXTERNAL_GENERATION_CONTROLLER_TARGET_JOBS_PER_WORKER`:每个 worker 实例承担的目标未完成任务数,默认 `2`;目标实例数按 `claimable_pending + running_active + expired_running` 计算后夹在 min/max 之间,避免把已包含过期 running 的 `claimable_count` 重复计入。
|
||||||
|
- `GENARRATIVE_EXTERNAL_GENERATION_CONTROLLER_POLL_INTERVAL_MS`:controller 轮询队列统计的间隔,默认 `10000`。
|
||||||
|
- `GENARRATIVE_EXTERNAL_GENERATION_CONTROLLER_SCALE_DOWN_IDLE_ROUNDS`:连续多少轮无可领取、无运行中、无过期 running 后才允许缩容,默认 `6`;缩容每轮只停止最高编号的一个实例。
|
||||||
|
- `GENARRATIVE_EXTERNAL_GENERATION_CONTROLLER_SERVICE_TEMPLATE`:systemd worker 模板,默认 `genarrative-external-generation-worker@{}.service`。
|
||||||
|
- `GENARRATIVE_EXTERNAL_GENERATION_CONTROLLER_DRY_RUN`:只记录决策不执行 systemctl,默认 `false`。
|
||||||
|
|
||||||
|
动态缩扩容方式:生产默认由 `deploy/systemd/genarrative-external-generation-controller.service` 启动 `GENARRATIVE_PROCESS_ROLE=external-generation-controller`,controller 读取 `get_external_generation_queue_stats_and_return` 后对 `genarrative-external-generation-worker@N.service` 执行精确 `systemctl start/stop`;无需改变 HTTP 进程数。controller 只操作 `@1..@MAX` 中的缺口或最高编号多余实例,保留 `@1` 作为保底 worker。缩容或发布重启 worker 时,进程收到 SIGINT/SIGTERM 后会停止 claim 新任务并等待当前任务完成;若进程被硬杀、机器断电或超过 systemd `TimeoutStopSec`,未完成任务会在 lease 过期后被其它 worker 重新领取。容器链路已有独立 `external-generation-worker` compose service;扩 worker 必须扩这个 worker service,不能只扩 `api-server` HTTP service。
|
||||||
|
|
||||||
## 已接入的拼图纵切
|
## 已接入的拼图纵切
|
||||||
|
|
||||||
@@ -147,13 +159,14 @@ GENARRATIVE_PROCESS_ROLE=all npm run dev
|
|||||||
curl -f http://127.0.0.1:<api-port>/healthz
|
curl -f http://127.0.0.1:<api-port>/healthz
|
||||||
```
|
```
|
||||||
|
|
||||||
本地同步排查可显式使用 `GENARRATIVE_EXTERNAL_GENERATION_MODE=inline npm run dev:api-server`,用于确认 provider、OSS 和 SpacetimeDB 写回链路本身是否可行;该模式不覆盖 worker 队列 smoke。生产 smoke 需要保持 `GENARRATIVE_EXTERNAL_GENERATION_MODE=queue`,并至少启动一个 `api` 角色和一个 `external-generation-worker` 角色;发布脚本会在默认 worker pattern 下自动启用并启动 `genarrative-external-generation-worker@1.service`,并等待 worker active。若 worker 数量归零,生成任务会保持 `queued/running`,不会由 HTTP 进程偷偷执行。
|
本地同步排查可显式使用 `GENARRATIVE_EXTERNAL_GENERATION_MODE=inline npm run dev:api-server`,用于确认 provider、OSS 和 SpacetimeDB 写回链路本身是否可行;该模式不覆盖 worker 队列 smoke。生产 smoke 需要保持 `GENARRATIVE_EXTERNAL_GENERATION_MODE=queue`,并至少启动一个 `api` 角色、一个 `external-generation-worker` 角色和一个 `external-generation-controller` 角色;发布脚本会在默认 worker pattern 下自动启用并启动 `genarrative-external-generation-worker@1.service`,重启并验活 `genarrative-external-generation-controller.service`。若 worker 数量归零,生成任务会保持 `queued/running`,不会由 HTTP 进程偷偷执行。
|
||||||
|
|
||||||
systemd 生产扩缩容示例:
|
systemd 生产 controller 与手动兜底示例:
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
systemctl enable --now genarrative-external-generation-worker@1.service
|
systemctl enable --now genarrative-external-generation-worker@1.service
|
||||||
|
systemctl enable --now genarrative-external-generation-controller.service
|
||||||
systemctl start genarrative-external-generation-worker@2.service
|
systemctl start genarrative-external-generation-worker@2.service
|
||||||
systemctl stop genarrative-external-generation-worker@2.service
|
systemctl stop genarrative-external-generation-worker@2.service
|
||||||
systemctl status 'genarrative-external-generation-worker@*.service'
|
systemctl status genarrative-external-generation-controller.service 'genarrative-external-generation-worker@*.service'
|
||||||
```
|
```
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
@@ -55,6 +55,7 @@
|
|||||||
"container:ps": "node scripts/container-compose.mjs ps",
|
"container:ps": "node scripts/container-compose.mjs ps",
|
||||||
"container:config": "node scripts/container-compose.mjs config",
|
"container:config": "node scripts/container-compose.mjs config",
|
||||||
"container:k6": "node scripts/container-compose.mjs k6",
|
"container:k6": "node scripts/container-compose.mjs k6",
|
||||||
|
"container:worker-smoke": "node scripts/container-worker-smoke.mjs",
|
||||||
"check": "npm run lint && npm run test && npm run build && npm run check:content",
|
"check": "npm run lint && npm run test && npm run build && npm run check:content",
|
||||||
"check:data": "node scripts/run-tsx.cjs scripts/validate-content.ts",
|
"check:data": "node scripts/run-tsx.cjs scripts/validate-content.ts",
|
||||||
"check:overrides": "node scripts/run-tsx.cjs scripts/validate-overrides.ts",
|
"check:overrides": "node scripts/run-tsx.cjs scripts/validate-overrides.ts",
|
||||||
|
|||||||
@@ -23,6 +23,46 @@ const checks = [
|
|||||||
includes: 'genarrative-health-patrol.timer',
|
includes: 'genarrative-health-patrol.timer',
|
||||||
reason: 'Server-Provision 必须安装并启用健康巡检 timer。',
|
reason: 'Server-Provision 必须安装并启用健康巡检 timer。',
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
file: 'scripts/jenkins-server-provision.sh',
|
||||||
|
includes: 'genarrative-external-generation-controller.service',
|
||||||
|
reason: 'Server-Provision 必须安装并启用外部生成 worker controller。',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
file: 'scripts/jenkins-server-provision.sh',
|
||||||
|
includes: 'genarrative-external-generation-worker@1.service',
|
||||||
|
reason: 'Server-Provision 必须启用外部生成保底 worker 实例。',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
file: 'scripts/deploy/production-api-deploy.sh',
|
||||||
|
includes: 'ensure_default_worker_service',
|
||||||
|
reason: 'API Deploy 必须在缺少 worker 实例时补启动默认外部生成 worker。',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
file: 'scripts/deploy/production-api-deploy.sh',
|
||||||
|
includes: 'wait_for_worker_services',
|
||||||
|
reason: 'API Deploy 必须等待外部生成 worker 实例 active。',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
file: 'scripts/deploy/production-api-deploy.sh',
|
||||||
|
includes: 'wait_for_worker_controller_service',
|
||||||
|
reason: 'API Deploy 必须重启并验活外部生成 worker controller。',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
file: 'deploy/systemd/genarrative-external-generation-worker@.service',
|
||||||
|
includes: 'GENARRATIVE_PROCESS_ROLE=external-generation-worker',
|
||||||
|
reason: '外部生成 worker 模板必须作为独立 worker 进程角色运行。',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
file: 'deploy/systemd/genarrative-external-generation-controller.service',
|
||||||
|
includes: 'GENARRATIVE_PROCESS_ROLE=external-generation-controller',
|
||||||
|
reason: '外部生成 worker controller 必须作为独立进程角色运行。',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
file: 'scripts/ops/production-health-patrol.mjs',
|
||||||
|
includes: 'checkActiveWorkerInstances',
|
||||||
|
reason: '生产健康巡检必须检查至少一个外部生成 worker 实例 active。',
|
||||||
|
},
|
||||||
{
|
{
|
||||||
file: 'scripts/build-production-release.sh',
|
file: 'scripts/build-production-release.sh',
|
||||||
includes: 'production-health-patrol.mjs',
|
includes: 'production-health-patrol.mjs',
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -5,11 +5,11 @@ set -euo pipefail
|
|||||||
usage() {
|
usage() {
|
||||||
cat <<'EOF'
|
cat <<'EOF'
|
||||||
用法:
|
用法:
|
||||||
./scripts/deploy/production-api-deploy.sh --source-dir build/<version> [--version <version>] [--release-root /opt/genarrative/releases] [--current-link /opt/genarrative/current] [--service genarrative-api.service] [--worker-service-pattern 'genarrative-external-generation-worker@*.service'] [--no-worker-services] [--health-url http://127.0.0.1:8082/readyz] [--api-env-file /etc/genarrative/api-server.env] [--database genarrative-prod] [--spacetime-server-url http://127.0.0.1:3101]
|
./scripts/deploy/production-api-deploy.sh --source-dir build/<version> [--version <version>] [--release-root /opt/genarrative/releases] [--current-link /opt/genarrative/current] [--service genarrative-api.service] [--worker-service-pattern 'genarrative-external-generation-worker@*.service'] [--no-worker-services] [--worker-controller-service genarrative-external-generation-controller.service] [--no-worker-controller] [--health-url http://127.0.0.1:8082/readyz] [--api-env-file /etc/genarrative/api-server.env] [--database genarrative-prod] [--spacetime-server-url http://127.0.0.1:3101]
|
||||||
|
|
||||||
说明:
|
说明:
|
||||||
进入维护模式,校验并发布 api-server 单文件,更新 current 链接,重启 systemd 服务并执行 readiness 检查。
|
进入维护模式,校验并发布 api-server 单文件,更新 current 链接,重启 systemd 服务并执行 readiness 检查。
|
||||||
默认同时重启已加载的外部生成 worker 实例;未启用 worker 单元时会自动跳过。
|
默认同时重启外部生成 worker controller 和已加载的 worker 实例;未启用 worker 单元时会自动跳过。
|
||||||
若传入 --database,会在重启前把 GENARRATIVE_SPACETIME_DATABASE 写入 api-server 环境文件,避免服务继续读取旧库。
|
若传入 --database,会在重启前把 GENARRATIVE_SPACETIME_DATABASE 写入 api-server 环境文件,避免服务继续读取旧库。
|
||||||
失败时保留维护模式。
|
失败时保留维护模式。
|
||||||
EOF
|
EOF
|
||||||
@@ -317,6 +317,43 @@ wait_for_worker_services() {
|
|||||||
return 1
|
return 1
|
||||||
}
|
}
|
||||||
|
|
||||||
|
ensure_worker_controller_service() {
|
||||||
|
local service="$1"
|
||||||
|
|
||||||
|
if [[ -z "${service}" ]]; then
|
||||||
|
return 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
if ! systemctl cat "${service}" >/dev/null 2>&1; then
|
||||||
|
echo "[production-api-deploy] 缺少外部生成 worker controller systemd 单元: ${service}" >&2
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "[production-api-deploy] 启用并重启外部生成 worker controller: ${service}"
|
||||||
|
systemctl enable "${service}"
|
||||||
|
systemctl restart "${service}"
|
||||||
|
}
|
||||||
|
|
||||||
|
wait_for_worker_controller_service() {
|
||||||
|
local service="$1"
|
||||||
|
|
||||||
|
if [[ -z "${service}" ]]; then
|
||||||
|
return 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "[production-api-deploy] 等待外部生成 worker controller active: ${service}"
|
||||||
|
for _ in {1..30}; do
|
||||||
|
if systemctl is-active --quiet "${service}"; then
|
||||||
|
return 0
|
||||||
|
fi
|
||||||
|
sleep 2
|
||||||
|
done
|
||||||
|
|
||||||
|
systemctl --no-pager --full status "${service}" || true
|
||||||
|
echo "[production-api-deploy] 外部生成 worker controller 未在超时时间内进入 active,发布失败。" >&2
|
||||||
|
return 1
|
||||||
|
}
|
||||||
|
|
||||||
SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)"
|
SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)"
|
||||||
SOURCE_DIR=""
|
SOURCE_DIR=""
|
||||||
VERSION=""
|
VERSION=""
|
||||||
@@ -324,6 +361,7 @@ RELEASE_ROOT="/opt/genarrative/releases"
|
|||||||
CURRENT_LINK="/opt/genarrative/current"
|
CURRENT_LINK="/opt/genarrative/current"
|
||||||
SERVICE_NAME="genarrative-api.service"
|
SERVICE_NAME="genarrative-api.service"
|
||||||
WORKER_SERVICE_PATTERN="genarrative-external-generation-worker@*.service"
|
WORKER_SERVICE_PATTERN="genarrative-external-generation-worker@*.service"
|
||||||
|
WORKER_CONTROLLER_SERVICE="genarrative-external-generation-controller.service"
|
||||||
HEALTH_URL="http://127.0.0.1:8082/readyz"
|
HEALTH_URL="http://127.0.0.1:8082/readyz"
|
||||||
API_ENV_FILE="/etc/genarrative/api-server.env"
|
API_ENV_FILE="/etc/genarrative/api-server.env"
|
||||||
DATABASE=""
|
DATABASE=""
|
||||||
@@ -364,6 +402,14 @@ while [[ $# -gt 0 ]]; do
|
|||||||
WORKER_SERVICE_PATTERN=""
|
WORKER_SERVICE_PATTERN=""
|
||||||
shift
|
shift
|
||||||
;;
|
;;
|
||||||
|
--worker-controller-service)
|
||||||
|
WORKER_CONTROLLER_SERVICE="${2:?缺少 --worker-controller-service 的值}"
|
||||||
|
shift 2
|
||||||
|
;;
|
||||||
|
--no-worker-controller)
|
||||||
|
WORKER_CONTROLLER_SERVICE=""
|
||||||
|
shift
|
||||||
|
;;
|
||||||
--health-url)
|
--health-url)
|
||||||
HEALTH_URL="${2:?缺少 --health-url 的值}"
|
HEALTH_URL="${2:?缺少 --health-url 的值}"
|
||||||
shift 2
|
shift 2
|
||||||
@@ -488,6 +534,8 @@ echo "[production-api-deploy] 重启服务: ${SERVICE_NAME}"
|
|||||||
systemctl restart "${SERVICE_NAME}"
|
systemctl restart "${SERVICE_NAME}"
|
||||||
restart_worker_services "${WORKER_SERVICE_PATTERN}"
|
restart_worker_services "${WORKER_SERVICE_PATTERN}"
|
||||||
wait_for_worker_services "${WORKER_SERVICE_PATTERN}"
|
wait_for_worker_services "${WORKER_SERVICE_PATTERN}"
|
||||||
|
ensure_worker_controller_service "${WORKER_CONTROLLER_SERVICE}"
|
||||||
|
wait_for_worker_controller_service "${WORKER_CONTROLLER_SERVICE}"
|
||||||
|
|
||||||
echo "[production-api-deploy] 等待 readiness: ${HEALTH_URL}"
|
echo "[production-api-deploy] 等待 readiness: ${HEALTH_URL}"
|
||||||
for _ in {1..30}; do
|
for _ in {1..30}; do
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ PROVISION_TOOLS_DIR="${PROVISION_TOOLS_DIR:-provision-tools}"
|
|||||||
SPACETIME_BIN_SOURCE="${SPACETIME_BIN_SOURCE:-${PROVISION_TOOLS_DIR}/spacetime/spacetime}"
|
SPACETIME_BIN_SOURCE="${SPACETIME_BIN_SOURCE:-${PROVISION_TOOLS_DIR}/spacetime/spacetime}"
|
||||||
OTELCOL_BIN_SOURCE="${OTELCOL_BIN_SOURCE:-${PROVISION_TOOLS_DIR}/otelcol-contrib}"
|
OTELCOL_BIN_SOURCE="${OTELCOL_BIN_SOURCE:-${PROVISION_TOOLS_DIR}/otelcol-contrib}"
|
||||||
WORKER_ENV_FILE="${WORKER_ENV_FILE:-/etc/genarrative/external-generation-worker.env}"
|
WORKER_ENV_FILE="${WORKER_ENV_FILE:-/etc/genarrative/external-generation-worker.env}"
|
||||||
|
CONTROLLER_ENV_FILE="${CONTROLLER_ENV_FILE:-/etc/genarrative/external-generation-controller.env}"
|
||||||
GENARRATIVE_OPENSSL_VERSION="${GENARRATIVE_OPENSSL_VERSION:-3.2.0}"
|
GENARRATIVE_OPENSSL_VERSION="${GENARRATIVE_OPENSSL_VERSION:-3.2.0}"
|
||||||
GENARRATIVE_OPENSSL_PREFIX="${GENARRATIVE_OPENSSL_PREFIX:-/opt/genarrative/openssl-3.2.0}"
|
GENARRATIVE_OPENSSL_PREFIX="${GENARRATIVE_OPENSSL_PREFIX:-/opt/genarrative/openssl-3.2.0}"
|
||||||
GENARRATIVE_OPENSSL_SOURCE_URL="${GENARRATIVE_OPENSSL_SOURCE_URL:-https://github.com/openssl/openssl/releases/download/openssl-${GENARRATIVE_OPENSSL_VERSION}/openssl-${GENARRATIVE_OPENSSL_VERSION}.tar.gz}"
|
GENARRATIVE_OPENSSL_SOURCE_URL="${GENARRATIVE_OPENSSL_SOURCE_URL:-https://github.com/openssl/openssl/releases/download/openssl-${GENARRATIVE_OPENSSL_VERSION}/openssl-${GENARRATIVE_OPENSSL_VERSION}.tar.gz}"
|
||||||
@@ -542,6 +543,10 @@ render_external_generation_worker_env_example() {
|
|||||||
cat deploy/env/external-generation-worker.env.example
|
cat deploy/env/external-generation-worker.env.example
|
||||||
}
|
}
|
||||||
|
|
||||||
|
render_external_generation_controller_env_example() {
|
||||||
|
cat deploy/env/external-generation-controller.env.example
|
||||||
|
}
|
||||||
|
|
||||||
render_otelcol_service() {
|
render_otelcol_service() {
|
||||||
cat deploy/systemd/otelcol-contrib.service
|
cat deploy/systemd/otelcol-contrib.service
|
||||||
}
|
}
|
||||||
@@ -740,6 +745,18 @@ render_external_generation_worker_service() {
|
|||||||
deploy/systemd/genarrative-external-generation-worker@.service
|
deploy/systemd/genarrative-external-generation-worker@.service
|
||||||
}
|
}
|
||||||
|
|
||||||
|
render_external_generation_controller_service() {
|
||||||
|
local current_escaped api_env_escaped controller_env_escaped
|
||||||
|
current_escaped="$(escape_sed_replacement "${CURRENT_LINK}")"
|
||||||
|
api_env_escaped="$(escape_sed_replacement "${API_ENV_FILE}")"
|
||||||
|
controller_env_escaped="$(escape_sed_replacement "${CONTROLLER_ENV_FILE}")"
|
||||||
|
sed \
|
||||||
|
-e "s|/opt/genarrative/current|${current_escaped}|g" \
|
||||||
|
-e "s|/etc/genarrative/api-server.env|${api_env_escaped}|g" \
|
||||||
|
-e "s|/etc/genarrative/external-generation-controller.env|${controller_env_escaped}|g" \
|
||||||
|
deploy/systemd/genarrative-external-generation-controller.service
|
||||||
|
}
|
||||||
|
|
||||||
render_database_backup_service() {
|
render_database_backup_service() {
|
||||||
local current_escaped env_escaped
|
local current_escaped env_escaped
|
||||||
current_escaped="$(escape_sed_replacement "${CURRENT_LINK}")"
|
current_escaped="$(escape_sed_replacement "${CURRENT_LINK}")"
|
||||||
@@ -761,6 +778,7 @@ render_health_patrol_service() {
|
|||||||
require_path deploy/systemd/spacetimedb.service
|
require_path deploy/systemd/spacetimedb.service
|
||||||
require_path deploy/systemd/genarrative-api.service
|
require_path deploy/systemd/genarrative-api.service
|
||||||
require_path deploy/systemd/genarrative-external-generation-worker@.service
|
require_path deploy/systemd/genarrative-external-generation-worker@.service
|
||||||
|
require_path deploy/systemd/genarrative-external-generation-controller.service
|
||||||
require_path deploy/systemd/genarrative-database-backup.service
|
require_path deploy/systemd/genarrative-database-backup.service
|
||||||
require_path deploy/systemd/genarrative-database-backup.timer
|
require_path deploy/systemd/genarrative-database-backup.timer
|
||||||
require_path deploy/systemd/genarrative-health-patrol.service
|
require_path deploy/systemd/genarrative-health-patrol.service
|
||||||
@@ -772,6 +790,7 @@ require_path deploy/nginx/genarrative-dev-http.conf
|
|||||||
require_path deploy/nginx/snippets/genarrative-maintenance.conf
|
require_path deploy/nginx/snippets/genarrative-maintenance.conf
|
||||||
require_path deploy/env/api-server.env.example
|
require_path deploy/env/api-server.env.example
|
||||||
require_path deploy/env/external-generation-worker.env.example
|
require_path deploy/env/external-generation-worker.env.example
|
||||||
|
require_path deploy/env/external-generation-controller.env.example
|
||||||
require_path scripts/deploy/maintenance-on.sh
|
require_path scripts/deploy/maintenance-on.sh
|
||||||
require_path scripts/deploy/maintenance-off.sh
|
require_path scripts/deploy/maintenance-off.sh
|
||||||
require_path scripts/deploy/maintenance-status.sh
|
require_path scripts/deploy/maintenance-status.sh
|
||||||
@@ -816,21 +835,24 @@ sync_spacetime_install "${SPACETIME_ROOT}"
|
|||||||
spacetimedb_service="$(mktemp)"
|
spacetimedb_service="$(mktemp)"
|
||||||
api_service="$(mktemp)"
|
api_service="$(mktemp)"
|
||||||
external_generation_worker_service="$(mktemp)"
|
external_generation_worker_service="$(mktemp)"
|
||||||
|
external_generation_controller_service="$(mktemp)"
|
||||||
database_backup_service="$(mktemp)"
|
database_backup_service="$(mktemp)"
|
||||||
health_patrol_service="$(mktemp)"
|
health_patrol_service="$(mktemp)"
|
||||||
render_spacetimedb_service >"${spacetimedb_service}"
|
render_spacetimedb_service >"${spacetimedb_service}"
|
||||||
render_api_service >"${api_service}"
|
render_api_service >"${api_service}"
|
||||||
render_external_generation_worker_service >"${external_generation_worker_service}"
|
render_external_generation_worker_service >"${external_generation_worker_service}"
|
||||||
|
render_external_generation_controller_service >"${external_generation_controller_service}"
|
||||||
render_database_backup_service >"${database_backup_service}"
|
render_database_backup_service >"${database_backup_service}"
|
||||||
render_health_patrol_service >"${health_patrol_service}"
|
render_health_patrol_service >"${health_patrol_service}"
|
||||||
install_file "${spacetimedb_service}" /etc/systemd/system/spacetimedb.service 0644
|
install_file "${spacetimedb_service}" /etc/systemd/system/spacetimedb.service 0644
|
||||||
install_file "${api_service}" /etc/systemd/system/genarrative-api.service 0644
|
install_file "${api_service}" /etc/systemd/system/genarrative-api.service 0644
|
||||||
install_file "${external_generation_worker_service}" /etc/systemd/system/genarrative-external-generation-worker@.service 0644
|
install_file "${external_generation_worker_service}" /etc/systemd/system/genarrative-external-generation-worker@.service 0644
|
||||||
|
install_file "${external_generation_controller_service}" /etc/systemd/system/genarrative-external-generation-controller.service 0644
|
||||||
install_file "${database_backup_service}" /etc/systemd/system/genarrative-database-backup.service 0644
|
install_file "${database_backup_service}" /etc/systemd/system/genarrative-database-backup.service 0644
|
||||||
install_file deploy/systemd/genarrative-database-backup.timer /etc/systemd/system/genarrative-database-backup.timer 0644
|
install_file deploy/systemd/genarrative-database-backup.timer /etc/systemd/system/genarrative-database-backup.timer 0644
|
||||||
install_file "${health_patrol_service}" /etc/systemd/system/genarrative-health-patrol.service 0644
|
install_file "${health_patrol_service}" /etc/systemd/system/genarrative-health-patrol.service 0644
|
||||||
install_file deploy/systemd/genarrative-health-patrol.timer /etc/systemd/system/genarrative-health-patrol.timer 0644
|
install_file deploy/systemd/genarrative-health-patrol.timer /etc/systemd/system/genarrative-health-patrol.timer 0644
|
||||||
rm -f "${spacetimedb_service}" "${api_service}" "${external_generation_worker_service}" "${database_backup_service}" "${health_patrol_service}"
|
rm -f "${spacetimedb_service}" "${api_service}" "${external_generation_worker_service}" "${external_generation_controller_service}" "${database_backup_service}" "${health_patrol_service}"
|
||||||
|
|
||||||
if [[ ! -f "${API_ENV_FILE}" ]]; then
|
if [[ ! -f "${API_ENV_FILE}" ]]; then
|
||||||
echo "+ create ${API_ENV_FILE} from example"
|
echo "+ create ${API_ENV_FILE} from example"
|
||||||
@@ -855,6 +877,17 @@ else
|
|||||||
echo "[server-provision] 已存在 worker 环境文件,保留不覆盖: ${WORKER_ENV_FILE}"
|
echo "[server-provision] 已存在 worker 环境文件,保留不覆盖: ${WORKER_ENV_FILE}"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if [[ ! -f "${CONTROLLER_ENV_FILE}" ]]; then
|
||||||
|
echo "+ create ${CONTROLLER_ENV_FILE} from example"
|
||||||
|
if [[ "${DRY_RUN}" != "true" ]]; then
|
||||||
|
render_external_generation_controller_env_example >"${CONTROLLER_ENV_FILE}"
|
||||||
|
chmod 0600 "${CONTROLLER_ENV_FILE}"
|
||||||
|
chown root:root "${CONTROLLER_ENV_FILE}"
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
echo "[server-provision] 已存在 controller 环境文件,保留不覆盖: ${CONTROLLER_ENV_FILE}"
|
||||||
|
fi
|
||||||
|
|
||||||
if [[ "${ENABLE_OTELCOL:-true}" == "true" ]]; then
|
if [[ "${ENABLE_OTELCOL:-true}" == "true" ]]; then
|
||||||
sync_otelcol_install
|
sync_otelcol_install
|
||||||
otelcol_service="$(mktemp)"
|
otelcol_service="$(mktemp)"
|
||||||
@@ -876,7 +909,7 @@ if [[ "${ENABLE_SERVICES}" == "true" ]]; then
|
|||||||
if [[ "${ENABLE_OTELCOL:-true}" == "true" ]]; then
|
if [[ "${ENABLE_OTELCOL:-true}" == "true" ]]; then
|
||||||
run_cmd systemctl enable otelcol-contrib.service
|
run_cmd systemctl enable otelcol-contrib.service
|
||||||
fi
|
fi
|
||||||
run_cmd systemctl enable spacetimedb.service genarrative-api.service genarrative-database-backup.timer genarrative-external-generation-worker@1.service genarrative-health-patrol.timer
|
run_cmd systemctl enable spacetimedb.service genarrative-api.service genarrative-database-backup.timer genarrative-external-generation-worker@1.service genarrative-external-generation-controller.service genarrative-health-patrol.timer
|
||||||
if [[ "${ENABLE_OTELCOL:-true}" == "true" ]]; then
|
if [[ "${ENABLE_OTELCOL:-true}" == "true" ]]; then
|
||||||
run_cmd systemctl restart otelcol-contrib.service
|
run_cmd systemctl restart otelcol-contrib.service
|
||||||
fi
|
fi
|
||||||
@@ -887,8 +920,10 @@ if [[ "${ENABLE_SERVICES}" == "true" ]]; then
|
|||||||
run_cmd systemctl restart genarrative-api.service
|
run_cmd systemctl restart genarrative-api.service
|
||||||
run_cmd systemctl enable --now genarrative-external-generation-worker@1.service
|
run_cmd systemctl enable --now genarrative-external-generation-worker@1.service
|
||||||
run_cmd systemctl restart genarrative-external-generation-worker@1.service
|
run_cmd systemctl restart genarrative-external-generation-worker@1.service
|
||||||
|
run_cmd systemctl enable --now genarrative-external-generation-controller.service
|
||||||
|
run_cmd systemctl restart genarrative-external-generation-controller.service
|
||||||
else
|
else
|
||||||
echo "[server-provision] 尚未发现 ${CURRENT_LINK}/api-server,跳过 api-server 和外部生成 worker 首次启动。后续 API deploy 会启用并启动默认 worker 实例。"
|
echo "[server-provision] 尚未发现 ${CURRENT_LINK}/api-server,跳过 api-server、外部生成 worker 和 controller 首次启动。后续 API deploy 会启用并启动默认 worker 与 controller。"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
@@ -20,9 +20,11 @@ const DEFAULT_PUBLIC_PATHS = [
|
|||||||
|
|
||||||
const DEFAULT_SERVICES = [
|
const DEFAULT_SERVICES = [
|
||||||
'genarrative-api.service',
|
'genarrative-api.service',
|
||||||
|
'genarrative-external-generation-controller.service',
|
||||||
'spacetimedb.service',
|
'spacetimedb.service',
|
||||||
'nginx.service',
|
'nginx.service',
|
||||||
];
|
];
|
||||||
|
const WORKER_SERVICE_PATTERN = 'genarrative-external-generation-worker@*.service';
|
||||||
|
|
||||||
function usage() {
|
function usage() {
|
||||||
console.log(`Usage:
|
console.log(`Usage:
|
||||||
@@ -216,6 +218,61 @@ async function checkService(serviceName, timeoutMs) {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async function checkActiveWorkerInstances(config) {
|
||||||
|
const result = await runCommand(
|
||||||
|
'systemctl',
|
||||||
|
[
|
||||||
|
'list-units',
|
||||||
|
WORKER_SERVICE_PATTERN,
|
||||||
|
'--type=service',
|
||||||
|
'--state=active',
|
||||||
|
'--no-legend',
|
||||||
|
'--plain',
|
||||||
|
'--no-pager',
|
||||||
|
],
|
||||||
|
config.timeoutMs,
|
||||||
|
);
|
||||||
|
if (result.code !== 0) {
|
||||||
|
return checkResult(
|
||||||
|
'service:external-generation-workers',
|
||||||
|
'CRITICAL',
|
||||||
|
'无法枚举外部生成 worker 实例',
|
||||||
|
{
|
||||||
|
command: result.command,
|
||||||
|
stderr: result.stderr.trim() || result.error,
|
||||||
|
},
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
const services = result.stdout
|
||||||
|
.split('\n')
|
||||||
|
.map((line) => line.trim().split(/\s+/u)[0])
|
||||||
|
.filter((service) =>
|
||||||
|
/^genarrative-external-generation-worker@.+\.service$/u.test(service),
|
||||||
|
);
|
||||||
|
|
||||||
|
if (services.length === 0) {
|
||||||
|
return checkResult(
|
||||||
|
'service:external-generation-workers',
|
||||||
|
'CRITICAL',
|
||||||
|
'没有 active 的外部生成 worker 实例',
|
||||||
|
{
|
||||||
|
command: result.command,
|
||||||
|
},
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
return checkResult(
|
||||||
|
'service:external-generation-workers',
|
||||||
|
'OK',
|
||||||
|
`${services.length} 个 worker active`,
|
||||||
|
{
|
||||||
|
command: result.command,
|
||||||
|
services,
|
||||||
|
},
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
function requestUrl(url, timeoutMs) {
|
function requestUrl(url, timeoutMs) {
|
||||||
return new Promise((resolve) => {
|
return new Promise((resolve) => {
|
||||||
const startedAt = Date.now();
|
const startedAt = Date.now();
|
||||||
@@ -310,6 +367,10 @@ async function checkRecentJournal(config) {
|
|||||||
'-u',
|
'-u',
|
||||||
'genarrative-api.service',
|
'genarrative-api.service',
|
||||||
'-u',
|
'-u',
|
||||||
|
'genarrative-external-generation-controller.service',
|
||||||
|
'-u',
|
||||||
|
WORKER_SERVICE_PATTERN,
|
||||||
|
'-u',
|
||||||
'spacetimedb.service',
|
'spacetimedb.service',
|
||||||
'-u',
|
'-u',
|
||||||
'nginx.service',
|
'nginx.service',
|
||||||
@@ -426,6 +487,7 @@ async function main() {
|
|||||||
for (const serviceName of DEFAULT_SERVICES) {
|
for (const serviceName of DEFAULT_SERVICES) {
|
||||||
checks.push(await checkService(serviceName, config.timeoutMs));
|
checks.push(await checkService(serviceName, config.timeoutMs));
|
||||||
}
|
}
|
||||||
|
checks.push(await checkActiveWorkerInstances(config));
|
||||||
|
|
||||||
checks.push(await checkHttp('api:/healthz', joinUrl(config.apiBaseUrl, '/healthz'), config));
|
checks.push(await checkHttp('api:/healthz', joinUrl(config.apiBaseUrl, '/healthz'), config));
|
||||||
checks.push(await checkHttp('api:/readyz', joinUrl(config.apiBaseUrl, '/readyz'), config));
|
checks.push(await checkHttp('api:/readyz', joinUrl(config.apiBaseUrl, '/readyz'), config));
|
||||||
|
|||||||
@@ -56,7 +56,7 @@ shared-kernel = { workspace = true }
|
|||||||
shared-logging = { workspace = true }
|
shared-logging = { workspace = true }
|
||||||
socket2 = { workspace = true }
|
socket2 = { workspace = true }
|
||||||
spacetime-client = { workspace = true }
|
spacetime-client = { workspace = true }
|
||||||
tokio = { workspace = true, features = ["macros", "rt-multi-thread", "net", "time", "sync", "fs", "io-util", "signal"] }
|
tokio = { workspace = true, features = ["macros", "rt-multi-thread", "net", "time", "sync", "fs", "io-util", "signal", "process"] }
|
||||||
tokio-stream = { workspace = true }
|
tokio-stream = { workspace = true }
|
||||||
futures-util = { workspace = true }
|
futures-util = { workspace = true }
|
||||||
time = { workspace = true, features = ["formatting"] }
|
time = { workspace = true, features = ["formatting"] }
|
||||||
|
|||||||
@@ -28,6 +28,13 @@ pub struct AppConfig {
|
|||||||
pub external_generation_worker_concurrency: usize,
|
pub external_generation_worker_concurrency: usize,
|
||||||
pub external_generation_worker_poll_interval: Duration,
|
pub external_generation_worker_poll_interval: Duration,
|
||||||
pub external_generation_worker_lease: Duration,
|
pub external_generation_worker_lease: Duration,
|
||||||
|
pub external_generation_controller_min_workers: usize,
|
||||||
|
pub external_generation_controller_max_workers: usize,
|
||||||
|
pub external_generation_controller_target_jobs_per_worker: usize,
|
||||||
|
pub external_generation_controller_poll_interval: Duration,
|
||||||
|
pub external_generation_controller_scale_down_idle_rounds: u32,
|
||||||
|
pub external_generation_controller_service_template: String,
|
||||||
|
pub external_generation_controller_dry_run: bool,
|
||||||
pub max_concurrent_requests: Option<usize>,
|
pub max_concurrent_requests: Option<usize>,
|
||||||
pub gallery_max_concurrent_requests: Option<usize>,
|
pub gallery_max_concurrent_requests: Option<usize>,
|
||||||
pub detail_max_concurrent_requests: Option<usize>,
|
pub detail_max_concurrent_requests: Option<usize>,
|
||||||
@@ -181,6 +188,7 @@ pub struct AppConfig {
|
|||||||
pub enum ProcessRole {
|
pub enum ProcessRole {
|
||||||
Api,
|
Api,
|
||||||
ExternalGenerationWorker,
|
ExternalGenerationWorker,
|
||||||
|
ExternalGenerationController,
|
||||||
All,
|
All,
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -208,6 +216,7 @@ impl ProcessRole {
|
|||||||
match self {
|
match self {
|
||||||
Self::Api => "api",
|
Self::Api => "api",
|
||||||
Self::ExternalGenerationWorker => "external-generation-worker",
|
Self::ExternalGenerationWorker => "external-generation-worker",
|
||||||
|
Self::ExternalGenerationController => "external-generation-controller",
|
||||||
Self::All => "all",
|
Self::All => "all",
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -219,6 +228,10 @@ impl ProcessRole {
|
|||||||
pub fn runs_external_generation_worker(self) -> bool {
|
pub fn runs_external_generation_worker(self) -> bool {
|
||||||
matches!(self, Self::ExternalGenerationWorker | Self::All)
|
matches!(self, Self::ExternalGenerationWorker | Self::All)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub fn runs_external_generation_controller(self) -> bool {
|
||||||
|
matches!(self, Self::ExternalGenerationController)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Default for AppConfig {
|
impl Default for AppConfig {
|
||||||
@@ -234,6 +247,14 @@ impl Default for AppConfig {
|
|||||||
external_generation_worker_concurrency: 2,
|
external_generation_worker_concurrency: 2,
|
||||||
external_generation_worker_poll_interval: Duration::from_millis(2_000),
|
external_generation_worker_poll_interval: Duration::from_millis(2_000),
|
||||||
external_generation_worker_lease: Duration::from_secs(3_600),
|
external_generation_worker_lease: Duration::from_secs(3_600),
|
||||||
|
external_generation_controller_min_workers: 1,
|
||||||
|
external_generation_controller_max_workers: 8,
|
||||||
|
external_generation_controller_target_jobs_per_worker: 2,
|
||||||
|
external_generation_controller_poll_interval: Duration::from_millis(10_000),
|
||||||
|
external_generation_controller_scale_down_idle_rounds: 6,
|
||||||
|
external_generation_controller_service_template:
|
||||||
|
"genarrative-external-generation-worker@{}.service".to_string(),
|
||||||
|
external_generation_controller_dry_run: false,
|
||||||
max_concurrent_requests: None,
|
max_concurrent_requests: None,
|
||||||
gallery_max_concurrent_requests: None,
|
gallery_max_concurrent_requests: None,
|
||||||
detail_max_concurrent_requests: None,
|
detail_max_concurrent_requests: None,
|
||||||
@@ -459,6 +480,49 @@ impl AppConfig {
|
|||||||
]) {
|
]) {
|
||||||
config.external_generation_worker_lease = Duration::from_secs(lease_seconds.max(1));
|
config.external_generation_worker_lease = Duration::from_secs(lease_seconds.max(1));
|
||||||
}
|
}
|
||||||
|
if let Some(min_workers) =
|
||||||
|
read_first_usize_env(&["GENARRATIVE_EXTERNAL_GENERATION_CONTROLLER_MIN_WORKERS"])
|
||||||
|
{
|
||||||
|
config.external_generation_controller_min_workers = min_workers;
|
||||||
|
}
|
||||||
|
if let Some(max_workers) =
|
||||||
|
read_first_usize_env(&["GENARRATIVE_EXTERNAL_GENERATION_CONTROLLER_MAX_WORKERS"])
|
||||||
|
{
|
||||||
|
config.external_generation_controller_max_workers = max_workers;
|
||||||
|
}
|
||||||
|
if config.external_generation_controller_max_workers
|
||||||
|
< config.external_generation_controller_min_workers
|
||||||
|
{
|
||||||
|
config.external_generation_controller_max_workers =
|
||||||
|
config.external_generation_controller_min_workers;
|
||||||
|
}
|
||||||
|
if let Some(target_jobs_per_worker) = read_first_usize_env(&[
|
||||||
|
"GENARRATIVE_EXTERNAL_GENERATION_CONTROLLER_TARGET_JOBS_PER_WORKER",
|
||||||
|
]) {
|
||||||
|
config.external_generation_controller_target_jobs_per_worker =
|
||||||
|
target_jobs_per_worker.max(1);
|
||||||
|
}
|
||||||
|
if let Some(poll_interval_ms) = read_first_positive_u64_env(&[
|
||||||
|
"GENARRATIVE_EXTERNAL_GENERATION_CONTROLLER_POLL_INTERVAL_MS",
|
||||||
|
]) {
|
||||||
|
config.external_generation_controller_poll_interval =
|
||||||
|
Duration::from_millis(poll_interval_ms);
|
||||||
|
}
|
||||||
|
if let Some(idle_rounds) = read_first_u32_env(&[
|
||||||
|
"GENARRATIVE_EXTERNAL_GENERATION_CONTROLLER_SCALE_DOWN_IDLE_ROUNDS",
|
||||||
|
]) {
|
||||||
|
config.external_generation_controller_scale_down_idle_rounds = idle_rounds;
|
||||||
|
}
|
||||||
|
if let Some(service_template) = read_first_non_empty_env(&[
|
||||||
|
"GENARRATIVE_EXTERNAL_GENERATION_CONTROLLER_SERVICE_TEMPLATE",
|
||||||
|
]) {
|
||||||
|
config.external_generation_controller_service_template = service_template;
|
||||||
|
}
|
||||||
|
if let Some(dry_run) =
|
||||||
|
read_first_bool_env(&["GENARRATIVE_EXTERNAL_GENERATION_CONTROLLER_DRY_RUN"])
|
||||||
|
{
|
||||||
|
config.external_generation_controller_dry_run = dry_run;
|
||||||
|
}
|
||||||
if let Some(max_concurrent_requests) =
|
if let Some(max_concurrent_requests) =
|
||||||
read_first_usize_env(&["GENARRATIVE_API_MAX_CONCURRENT_REQUESTS"])
|
read_first_usize_env(&["GENARRATIVE_API_MAX_CONCURRENT_REQUESTS"])
|
||||||
{
|
{
|
||||||
@@ -1214,6 +1278,9 @@ fn parse_process_role(value: &str) -> Option<ProcessRole> {
|
|||||||
"external-generation-worker" | "external_generation_worker" | "worker" => {
|
"external-generation-worker" | "external_generation_worker" | "worker" => {
|
||||||
Some(ProcessRole::ExternalGenerationWorker)
|
Some(ProcessRole::ExternalGenerationWorker)
|
||||||
}
|
}
|
||||||
|
"external-generation-controller" | "external_generation_controller" | "controller" => {
|
||||||
|
Some(ProcessRole::ExternalGenerationController)
|
||||||
|
}
|
||||||
"all" => Some(ProcessRole::All),
|
"all" => Some(ProcessRole::All),
|
||||||
_ => None,
|
_ => None,
|
||||||
}
|
}
|
||||||
@@ -1419,15 +1486,29 @@ mod tests {
|
|||||||
parse_process_role("worker"),
|
parse_process_role("worker"),
|
||||||
Some(ProcessRole::ExternalGenerationWorker)
|
Some(ProcessRole::ExternalGenerationWorker)
|
||||||
);
|
);
|
||||||
|
assert_eq!(
|
||||||
|
parse_process_role("controller"),
|
||||||
|
Some(ProcessRole::ExternalGenerationController)
|
||||||
|
);
|
||||||
|
assert_eq!(
|
||||||
|
parse_process_role("'external_generation_controller'"),
|
||||||
|
Some(ProcessRole::ExternalGenerationController)
|
||||||
|
);
|
||||||
assert_eq!(parse_process_role("all"), Some(ProcessRole::All));
|
assert_eq!(parse_process_role("all"), Some(ProcessRole::All));
|
||||||
assert_eq!(parse_process_role("unknown"), None);
|
assert_eq!(parse_process_role("unknown"), None);
|
||||||
|
|
||||||
assert!(ProcessRole::Api.runs_http());
|
assert!(ProcessRole::Api.runs_http());
|
||||||
assert!(!ProcessRole::Api.runs_external_generation_worker());
|
assert!(!ProcessRole::Api.runs_external_generation_worker());
|
||||||
|
assert!(!ProcessRole::Api.runs_external_generation_controller());
|
||||||
assert!(!ProcessRole::ExternalGenerationWorker.runs_http());
|
assert!(!ProcessRole::ExternalGenerationWorker.runs_http());
|
||||||
assert!(ProcessRole::ExternalGenerationWorker.runs_external_generation_worker());
|
assert!(ProcessRole::ExternalGenerationWorker.runs_external_generation_worker());
|
||||||
|
assert!(!ProcessRole::ExternalGenerationWorker.runs_external_generation_controller());
|
||||||
|
assert!(!ProcessRole::ExternalGenerationController.runs_http());
|
||||||
|
assert!(!ProcessRole::ExternalGenerationController.runs_external_generation_worker());
|
||||||
|
assert!(ProcessRole::ExternalGenerationController.runs_external_generation_controller());
|
||||||
assert!(ProcessRole::All.runs_http());
|
assert!(ProcessRole::All.runs_http());
|
||||||
assert!(ProcessRole::All.runs_external_generation_worker());
|
assert!(ProcessRole::All.runs_external_generation_worker());
|
||||||
|
assert!(!ProcessRole::All.runs_external_generation_controller());
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
|
|||||||
@@ -0,0 +1,465 @@
|
|||||||
|
use std::{collections::BTreeSet, future::Future, io, pin::Pin, process::Stdio, time::Duration};
|
||||||
|
|
||||||
|
use spacetime_client::ExternalGenerationQueueStatsRecord;
|
||||||
|
use tokio::{
|
||||||
|
process::Command,
|
||||||
|
time::{Instant, sleep},
|
||||||
|
};
|
||||||
|
use tracing::{error, info, warn};
|
||||||
|
|
||||||
|
use crate::state::AppState;
|
||||||
|
|
||||||
|
#[derive(Clone, Debug)]
|
||||||
|
struct ExternalGenerationWorkerControllerConfig {
|
||||||
|
min_workers: usize,
|
||||||
|
max_workers: usize,
|
||||||
|
target_jobs_per_worker: usize,
|
||||||
|
poll_interval: Duration,
|
||||||
|
scale_down_idle_rounds: u32,
|
||||||
|
service_template: String,
|
||||||
|
dry_run: bool,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Clone, Debug, Eq, PartialEq)]
|
||||||
|
struct ExternalGenerationWorkerControllerDecision {
|
||||||
|
desired_workers: usize,
|
||||||
|
should_scale_down: bool,
|
||||||
|
idle_rounds: u32,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Default)]
|
||||||
|
struct ExternalGenerationWorkerControllerState {
|
||||||
|
idle_rounds: u32,
|
||||||
|
}
|
||||||
|
|
||||||
|
pub(crate) async fn run_external_generation_worker_controller(
|
||||||
|
state: AppState,
|
||||||
|
) -> Result<(), io::Error> {
|
||||||
|
let config = ExternalGenerationWorkerControllerConfig::from_state(&state);
|
||||||
|
let mut controller_state = ExternalGenerationWorkerControllerState::default();
|
||||||
|
let mut shutdown = external_generation_controller_shutdown_signal();
|
||||||
|
|
||||||
|
info!(
|
||||||
|
min_workers = config.min_workers,
|
||||||
|
max_workers = config.max_workers,
|
||||||
|
target_jobs_per_worker = config.target_jobs_per_worker,
|
||||||
|
poll_interval_ms = config.poll_interval.as_millis(),
|
||||||
|
scale_down_idle_rounds = config.scale_down_idle_rounds,
|
||||||
|
service_template = config.service_template,
|
||||||
|
dry_run = config.dry_run,
|
||||||
|
"external generation worker controller 已启动"
|
||||||
|
);
|
||||||
|
|
||||||
|
loop {
|
||||||
|
let tick = run_external_generation_controller_tick(&state, &config, &mut controller_state);
|
||||||
|
tokio::select! {
|
||||||
|
_ = shutdown.as_mut() => {
|
||||||
|
info!("external generation worker controller 收到停机信号");
|
||||||
|
return Ok(());
|
||||||
|
}
|
||||||
|
result = tick => {
|
||||||
|
if let Err(error) = result {
|
||||||
|
error!(error = %error, "external generation worker controller 本轮扩缩容失败");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
let next_tick = sleep(config.poll_interval);
|
||||||
|
tokio::pin!(next_tick);
|
||||||
|
tokio::select! {
|
||||||
|
_ = shutdown.as_mut() => {
|
||||||
|
info!("external generation worker controller 收到停机信号");
|
||||||
|
return Ok(());
|
||||||
|
}
|
||||||
|
_ = &mut next_tick => {}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn run_external_generation_controller_tick(
|
||||||
|
state: &AppState,
|
||||||
|
config: &ExternalGenerationWorkerControllerConfig,
|
||||||
|
controller_state: &mut ExternalGenerationWorkerControllerState,
|
||||||
|
) -> Result<(), String> {
|
||||||
|
let stats = state
|
||||||
|
.spacetime_client()
|
||||||
|
.get_external_generation_queue_stats()
|
||||||
|
.await
|
||||||
|
.map_err(|error| format!("读取 external_generation_job 队列统计失败:{error}"))?;
|
||||||
|
let active_instances = list_active_external_generation_worker_instances(config).await?;
|
||||||
|
let current_workers = active_instances.len();
|
||||||
|
let decision = decide_external_generation_worker_target(
|
||||||
|
&stats,
|
||||||
|
current_workers,
|
||||||
|
controller_state.idle_rounds,
|
||||||
|
config,
|
||||||
|
);
|
||||||
|
controller_state.idle_rounds = decision.idle_rounds;
|
||||||
|
|
||||||
|
info!(
|
||||||
|
pending = stats.pending_count,
|
||||||
|
delayed_pending = stats.delayed_pending_count,
|
||||||
|
claimable = stats.claimable_count,
|
||||||
|
running_active = stats.running_active_count,
|
||||||
|
expired_running = stats.expired_running_count,
|
||||||
|
oldest_claimable_age_ms = stats.oldest_claimable_age_micros.unwrap_or(0) / 1_000,
|
||||||
|
current_workers,
|
||||||
|
desired_workers = decision.desired_workers,
|
||||||
|
idle_rounds = decision.idle_rounds,
|
||||||
|
"external generation worker controller 完成队列评估"
|
||||||
|
);
|
||||||
|
|
||||||
|
reconcile_external_generation_worker_instances(config, &active_instances, &decision).await
|
||||||
|
}
|
||||||
|
|
||||||
|
fn decide_external_generation_worker_target(
|
||||||
|
stats: &ExternalGenerationQueueStatsRecord,
|
||||||
|
current_workers: usize,
|
||||||
|
previous_idle_rounds: u32,
|
||||||
|
config: &ExternalGenerationWorkerControllerConfig,
|
||||||
|
) -> ExternalGenerationWorkerControllerDecision {
|
||||||
|
let pressure = stats
|
||||||
|
.claimable_pending_count
|
||||||
|
.saturating_add(stats.running_active_count)
|
||||||
|
.saturating_add(stats.expired_running_count);
|
||||||
|
let desired_from_pressure =
|
||||||
|
ceil_div_usize(pressure as usize, config.target_jobs_per_worker.max(1));
|
||||||
|
let desired_workers = desired_from_pressure.clamp(config.min_workers, config.max_workers);
|
||||||
|
let is_idle = stats.claimable_count == 0
|
||||||
|
&& stats.expired_running_count == 0
|
||||||
|
&& stats.running_active_count == 0
|
||||||
|
&& desired_workers <= config.min_workers;
|
||||||
|
let idle_rounds = if is_idle {
|
||||||
|
previous_idle_rounds.saturating_add(1)
|
||||||
|
} else {
|
||||||
|
0
|
||||||
|
};
|
||||||
|
let should_scale_down = current_workers > desired_workers
|
||||||
|
&& idle_rounds >= config.scale_down_idle_rounds
|
||||||
|
&& config.scale_down_idle_rounds > 0;
|
||||||
|
|
||||||
|
ExternalGenerationWorkerControllerDecision {
|
||||||
|
desired_workers,
|
||||||
|
should_scale_down,
|
||||||
|
idle_rounds,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn reconcile_external_generation_worker_instances(
|
||||||
|
config: &ExternalGenerationWorkerControllerConfig,
|
||||||
|
active_instances: &BTreeSet<usize>,
|
||||||
|
decision: &ExternalGenerationWorkerControllerDecision,
|
||||||
|
) -> Result<(), String> {
|
||||||
|
let current_workers = active_instances.len();
|
||||||
|
let mut started = 0usize;
|
||||||
|
for instance in 1..=config.max_workers {
|
||||||
|
if current_workers.saturating_add(started) >= decision.desired_workers {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
if !active_instances.contains(&instance) {
|
||||||
|
systemctl_worker_instance(config, "start", instance).await?;
|
||||||
|
started = started.saturating_add(1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if decision.desired_workers > current_workers && started == 0 {
|
||||||
|
warn!(
|
||||||
|
current_workers,
|
||||||
|
desired_workers = decision.desired_workers,
|
||||||
|
"external generation worker controller 未找到可启动的缺口实例"
|
||||||
|
);
|
||||||
|
}
|
||||||
|
if started > 0 {
|
||||||
|
return Ok(());
|
||||||
|
}
|
||||||
|
|
||||||
|
if decision.should_scale_down && decision.desired_workers < current_workers {
|
||||||
|
if let Some(instance) = active_instances
|
||||||
|
.iter()
|
||||||
|
.rev()
|
||||||
|
.copied()
|
||||||
|
.find(|instance| *instance > config.min_workers.max(1))
|
||||||
|
{
|
||||||
|
systemctl_worker_instance(config, "stop", instance).await?;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn list_active_external_generation_worker_instances(
|
||||||
|
config: &ExternalGenerationWorkerControllerConfig,
|
||||||
|
) -> Result<BTreeSet<usize>, String> {
|
||||||
|
let mut active_instances = BTreeSet::new();
|
||||||
|
for instance in 1..=config.max_workers {
|
||||||
|
if is_external_generation_worker_instance_active(config, instance).await? {
|
||||||
|
active_instances.insert(instance);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Ok(active_instances)
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn is_external_generation_worker_instance_active(
|
||||||
|
config: &ExternalGenerationWorkerControllerConfig,
|
||||||
|
instance: usize,
|
||||||
|
) -> Result<bool, String> {
|
||||||
|
let service = format_worker_service_name(&config.service_template, instance)?;
|
||||||
|
if config.dry_run {
|
||||||
|
return Ok(instance <= config.min_workers);
|
||||||
|
}
|
||||||
|
|
||||||
|
let output = Command::new("systemctl")
|
||||||
|
.arg("is-active")
|
||||||
|
.arg("--quiet")
|
||||||
|
.arg(&service)
|
||||||
|
.stdin(Stdio::null())
|
||||||
|
.stdout(Stdio::null())
|
||||||
|
.stderr(Stdio::null())
|
||||||
|
.output()
|
||||||
|
.await
|
||||||
|
.map_err(|error| format!("执行 systemctl is-active {service} 失败:{error}"))?;
|
||||||
|
Ok(output.status.success())
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn systemctl_worker_instance(
|
||||||
|
config: &ExternalGenerationWorkerControllerConfig,
|
||||||
|
action: &str,
|
||||||
|
instance: usize,
|
||||||
|
) -> Result<(), String> {
|
||||||
|
let service = format_worker_service_name(&config.service_template, instance)?;
|
||||||
|
if config.dry_run {
|
||||||
|
info!(
|
||||||
|
action,
|
||||||
|
service, "external generation worker controller dry-run 跳过 systemctl"
|
||||||
|
);
|
||||||
|
return Ok(());
|
||||||
|
}
|
||||||
|
|
||||||
|
let started_at = Instant::now();
|
||||||
|
let output = Command::new("systemctl")
|
||||||
|
.arg(action)
|
||||||
|
.arg(&service)
|
||||||
|
.stdin(Stdio::null())
|
||||||
|
.stdout(Stdio::piped())
|
||||||
|
.stderr(Stdio::piped())
|
||||||
|
.output()
|
||||||
|
.await
|
||||||
|
.map_err(|error| format!("执行 systemctl {action} {service} 失败:{error}"))?;
|
||||||
|
if !output.status.success() {
|
||||||
|
let stderr = String::from_utf8_lossy(&output.stderr);
|
||||||
|
return Err(format!(
|
||||||
|
"systemctl {action} {service} 返回失败 status={} stderr={}",
|
||||||
|
output.status, stderr
|
||||||
|
));
|
||||||
|
}
|
||||||
|
|
||||||
|
info!(
|
||||||
|
action,
|
||||||
|
service,
|
||||||
|
elapsed_ms = started_at.elapsed().as_millis(),
|
||||||
|
"external generation worker controller 已执行 systemctl"
|
||||||
|
);
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
fn format_worker_service_name(template: &str, instance: usize) -> Result<String, String> {
|
||||||
|
let instance = instance.to_string();
|
||||||
|
if template.contains("{}") {
|
||||||
|
return Ok(template.replacen("{}", &instance, 1));
|
||||||
|
}
|
||||||
|
if template.contains("%i") {
|
||||||
|
return Ok(template.replacen("%i", &instance, 1));
|
||||||
|
}
|
||||||
|
Err("external generation controller service template 必须包含 {} 或 %i".to_string())
|
||||||
|
}
|
||||||
|
|
||||||
|
fn ceil_div_usize(value: usize, divisor: usize) -> usize {
|
||||||
|
if value == 0 {
|
||||||
|
0
|
||||||
|
} else {
|
||||||
|
value.saturating_add(divisor.saturating_sub(1)) / divisor.max(1)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl ExternalGenerationWorkerControllerConfig {
|
||||||
|
fn from_state(state: &AppState) -> Self {
|
||||||
|
let min_workers = state.config.external_generation_controller_min_workers;
|
||||||
|
let max_workers = state
|
||||||
|
.config
|
||||||
|
.external_generation_controller_max_workers
|
||||||
|
.max(min_workers);
|
||||||
|
Self {
|
||||||
|
min_workers,
|
||||||
|
max_workers,
|
||||||
|
target_jobs_per_worker: state
|
||||||
|
.config
|
||||||
|
.external_generation_controller_target_jobs_per_worker
|
||||||
|
.max(1),
|
||||||
|
poll_interval: state.config.external_generation_controller_poll_interval,
|
||||||
|
scale_down_idle_rounds: state
|
||||||
|
.config
|
||||||
|
.external_generation_controller_scale_down_idle_rounds,
|
||||||
|
service_template: state
|
||||||
|
.config
|
||||||
|
.external_generation_controller_service_template
|
||||||
|
.clone(),
|
||||||
|
dry_run: state.config.external_generation_controller_dry_run,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
type ExternalGenerationControllerShutdownSignal = Pin<Box<dyn Future<Output = ()> + Send>>;
|
||||||
|
|
||||||
|
fn external_generation_controller_shutdown_signal() -> ExternalGenerationControllerShutdownSignal {
|
||||||
|
Box::pin(async {
|
||||||
|
wait_for_external_generation_controller_shutdown_signal().await;
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(unix)]
|
||||||
|
async fn wait_for_external_generation_controller_shutdown_signal() {
|
||||||
|
use tokio::signal::unix::{SignalKind, signal};
|
||||||
|
|
||||||
|
let mut sigterm = signal(SignalKind::terminate()).ok();
|
||||||
|
tokio::select! {
|
||||||
|
result = tokio::signal::ctrl_c() => {
|
||||||
|
if let Err(error) = result {
|
||||||
|
warn!(error = %error, "external generation worker controller 监听 SIGINT 失败");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
_ = async {
|
||||||
|
if let Some(sigterm) = sigterm.as_mut() {
|
||||||
|
sigterm.recv().await;
|
||||||
|
} else {
|
||||||
|
std::future::pending::<()>().await;
|
||||||
|
}
|
||||||
|
} => {}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(not(unix))]
|
||||||
|
async fn wait_for_external_generation_controller_shutdown_signal() {
|
||||||
|
if let Err(error) = tokio::signal::ctrl_c().await {
|
||||||
|
warn!(error = %error, "external generation worker controller 监听 Ctrl-C 失败");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
use super::*;
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn scales_up_to_max_when_queue_pressure_is_high() {
|
||||||
|
let config = controller_config_fixture();
|
||||||
|
let stats = stats_fixture(120, 0, 8);
|
||||||
|
|
||||||
|
let decision = decide_external_generation_worker_target(&stats, 1, 0, &config);
|
||||||
|
|
||||||
|
assert_eq!(decision.desired_workers, 8);
|
||||||
|
assert!(!decision.should_scale_down);
|
||||||
|
assert_eq!(decision.idle_rounds, 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn scale_down_requires_consecutive_idle_rounds() {
|
||||||
|
let config = controller_config_fixture();
|
||||||
|
let stats = stats_fixture(0, 0, 0);
|
||||||
|
|
||||||
|
let first = decide_external_generation_worker_target(&stats, 5, 0, &config);
|
||||||
|
let ready = decide_external_generation_worker_target(
|
||||||
|
&stats,
|
||||||
|
5,
|
||||||
|
config.scale_down_idle_rounds.saturating_sub(1),
|
||||||
|
&config,
|
||||||
|
);
|
||||||
|
|
||||||
|
assert_eq!(first.desired_workers, config.min_workers);
|
||||||
|
assert!(!first.should_scale_down);
|
||||||
|
assert!(ready.should_scale_down);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn running_jobs_hold_capacity_before_scale_down() {
|
||||||
|
let config = controller_config_fixture();
|
||||||
|
let stats = stats_fixture(0, 6, 0);
|
||||||
|
|
||||||
|
let decision = decide_external_generation_worker_target(&stats, 5, 5, &config);
|
||||||
|
|
||||||
|
assert_eq!(decision.desired_workers, 3);
|
||||||
|
assert!(!decision.should_scale_down);
|
||||||
|
assert_eq!(decision.idle_rounds, 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn expired_running_jobs_are_not_counted_twice_as_claimable_pressure() {
|
||||||
|
let config = controller_config_fixture();
|
||||||
|
let stats = stats_fixture(0, 0, 3);
|
||||||
|
|
||||||
|
let decision = decide_external_generation_worker_target(&stats, 1, 0, &config);
|
||||||
|
|
||||||
|
assert_eq!(decision.desired_workers, 2);
|
||||||
|
assert!(!decision.should_scale_down);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn formats_worker_service_name_with_supported_templates() {
|
||||||
|
assert_eq!(
|
||||||
|
format_worker_service_name("genarrative-external-generation-worker@{}.service", 3)
|
||||||
|
.expect("format"),
|
||||||
|
"genarrative-external-generation-worker@3.service"
|
||||||
|
);
|
||||||
|
assert_eq!(
|
||||||
|
format_worker_service_name("worker@%i.service", 7).expect("format"),
|
||||||
|
"worker@7.service"
|
||||||
|
);
|
||||||
|
assert!(format_worker_service_name("worker.service", 1).is_err());
|
||||||
|
}
|
||||||
|
|
||||||
|
#[tokio::test]
|
||||||
|
async fn dry_run_reconcile_does_not_start_low_number_gaps_when_capacity_is_enough() {
|
||||||
|
let config = controller_config_fixture();
|
||||||
|
let active_instances = BTreeSet::from([3usize, 4usize]);
|
||||||
|
let decision = ExternalGenerationWorkerControllerDecision {
|
||||||
|
desired_workers: 2,
|
||||||
|
should_scale_down: false,
|
||||||
|
idle_rounds: 0,
|
||||||
|
};
|
||||||
|
|
||||||
|
let result =
|
||||||
|
reconcile_external_generation_worker_instances(&config, &active_instances, &decision)
|
||||||
|
.await;
|
||||||
|
|
||||||
|
assert!(result.is_ok());
|
||||||
|
}
|
||||||
|
|
||||||
|
fn controller_config_fixture() -> ExternalGenerationWorkerControllerConfig {
|
||||||
|
ExternalGenerationWorkerControllerConfig {
|
||||||
|
min_workers: 1,
|
||||||
|
max_workers: 8,
|
||||||
|
target_jobs_per_worker: 2,
|
||||||
|
poll_interval: Duration::from_secs(10),
|
||||||
|
scale_down_idle_rounds: 3,
|
||||||
|
service_template: "genarrative-external-generation-worker@{}.service".to_string(),
|
||||||
|
dry_run: true,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn stats_fixture(
|
||||||
|
claimable_pending_count: u32,
|
||||||
|
running_active_count: u32,
|
||||||
|
expired_running_count: u32,
|
||||||
|
) -> ExternalGenerationQueueStatsRecord {
|
||||||
|
let claimable_count = claimable_pending_count.saturating_add(expired_running_count);
|
||||||
|
ExternalGenerationQueueStatsRecord {
|
||||||
|
pending_count: claimable_pending_count,
|
||||||
|
delayed_pending_count: 0,
|
||||||
|
claimable_pending_count,
|
||||||
|
running_active_count,
|
||||||
|
expired_running_count,
|
||||||
|
terminal_count: 0,
|
||||||
|
claimable_count,
|
||||||
|
oldest_claimable_age_micros: None,
|
||||||
|
now_micros: 0,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -41,6 +41,7 @@ mod edutainment_baby_object;
|
|||||||
mod error_middleware;
|
mod error_middleware;
|
||||||
mod external_api_audit;
|
mod external_api_audit;
|
||||||
mod external_generation_worker;
|
mod external_generation_worker;
|
||||||
|
mod external_generation_worker_controller;
|
||||||
pub(crate) mod generated_asset_sheets;
|
pub(crate) mod generated_asset_sheets;
|
||||||
mod generated_image_assets;
|
mod generated_image_assets;
|
||||||
mod health;
|
mod health;
|
||||||
@@ -116,6 +117,7 @@ use crate::{
|
|||||||
app::{build_router, build_spacetime_unavailable_router},
|
app::{build_router, build_spacetime_unavailable_router},
|
||||||
config::AppConfig,
|
config::AppConfig,
|
||||||
external_generation_worker::run_external_generation_worker,
|
external_generation_worker::run_external_generation_worker,
|
||||||
|
external_generation_worker_controller::run_external_generation_worker_controller,
|
||||||
state::{AppState, AppStateInitError},
|
state::{AppState, AppStateInitError},
|
||||||
tracking_outbox::TrackingOutbox,
|
tracking_outbox::TrackingOutbox,
|
||||||
wallet_refund_outbox::WalletRefundOutbox,
|
wallet_refund_outbox::WalletRefundOutbox,
|
||||||
@@ -188,9 +190,18 @@ async fn run_worker_only(config: AppConfig) -> Result<(), io::Error> {
|
|||||||
spawn_app_state_background_workers(&state);
|
spawn_app_state_background_workers(&state);
|
||||||
info!(
|
info!(
|
||||||
process_role = process_role.as_str(),
|
process_role = process_role.as_str(),
|
||||||
"api-server 以 worker 角色启动"
|
"api-server 以非 HTTP 角色启动"
|
||||||
);
|
);
|
||||||
run_external_generation_worker(state).await
|
if process_role.runs_external_generation_worker() {
|
||||||
|
run_external_generation_worker(state).await
|
||||||
|
} else if process_role.runs_external_generation_controller() {
|
||||||
|
run_external_generation_worker_controller(state).await
|
||||||
|
} else {
|
||||||
|
Err(io::Error::other(format!(
|
||||||
|
"不支持的非 HTTP 进程角色:{}",
|
||||||
|
process_role.as_str()
|
||||||
|
)))
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
async fn run_http_role(config: AppConfig) -> Result<(), io::Error> {
|
async fn run_http_role(config: AppConfig) -> Result<(), io::Error> {
|
||||||
|
|||||||
@@ -126,4 +126,23 @@ impl SpacetimeClient {
|
|||||||
)
|
)
|
||||||
.await
|
.await
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub async fn get_external_generation_queue_stats(
|
||||||
|
&self,
|
||||||
|
) -> Result<ExternalGenerationQueueStatsRecord, SpacetimeClientError> {
|
||||||
|
self.call_after_connect(
|
||||||
|
"get_external_generation_queue_stats_and_return",
|
||||||
|
move |connection, sender| {
|
||||||
|
connection
|
||||||
|
.procedures()
|
||||||
|
.get_external_generation_queue_stats_and_return_then(move |_, result| {
|
||||||
|
let mapped = result
|
||||||
|
.map_err(SpacetimeClientError::from_sdk_error)
|
||||||
|
.and_then(map_external_generation_queue_stats_result);
|
||||||
|
send_once(&sender, mapped);
|
||||||
|
});
|
||||||
|
},
|
||||||
|
)
|
||||||
|
.await
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -33,12 +33,13 @@ pub use mapper::{
|
|||||||
CustomWorldWorkSummaryRecord, ExternalGenerationJobClaimRecordInput,
|
CustomWorldWorkSummaryRecord, ExternalGenerationJobClaimRecordInput,
|
||||||
ExternalGenerationJobCompleteRecordInput, ExternalGenerationJobEnqueueRecordInput,
|
ExternalGenerationJobCompleteRecordInput, ExternalGenerationJobEnqueueRecordInput,
|
||||||
ExternalGenerationJobFailRecordInput, ExternalGenerationJobRecord,
|
ExternalGenerationJobFailRecordInput, ExternalGenerationJobRecord,
|
||||||
ExternalGenerationJobRenewLeaseRecordInput, JumpHopActionRequest, JumpHopActionResponse,
|
ExternalGenerationJobRenewLeaseRecordInput, ExternalGenerationQueueStatsRecord,
|
||||||
JumpHopActionType, JumpHopCharacterAsset, JumpHopDifficulty, JumpHopDraftResponse,
|
JumpHopActionRequest, JumpHopActionResponse, JumpHopActionType, JumpHopCharacterAsset,
|
||||||
JumpHopGalleryCardResponse, JumpHopGalleryDetailResponse, JumpHopGalleryResponse,
|
JumpHopDifficulty, JumpHopDraftResponse, JumpHopGalleryCardResponse,
|
||||||
JumpHopGenerationStatus, JumpHopJumpRequest, JumpHopJumpResponse, JumpHopJumpResult,
|
JumpHopGalleryDetailResponse, JumpHopGalleryResponse, JumpHopGenerationStatus,
|
||||||
JumpHopLastJump, JumpHopPath, JumpHopPlatform, JumpHopRestartRunRequest, JumpHopRunResponse,
|
JumpHopJumpRequest, JumpHopJumpResponse, JumpHopJumpResult, JumpHopLastJump, JumpHopPath,
|
||||||
JumpHopRunStatus, JumpHopRuntimeRunSnapshotResponse, JumpHopScoring, JumpHopSessionResponse,
|
JumpHopPlatform, JumpHopRestartRunRequest, JumpHopRunResponse, JumpHopRunStatus,
|
||||||
|
JumpHopRuntimeRunSnapshotResponse, JumpHopScoring, JumpHopSessionResponse,
|
||||||
JumpHopSessionSnapshotResponse, JumpHopStartRunRequest, JumpHopStylePreset, JumpHopTileAsset,
|
JumpHopSessionSnapshotResponse, JumpHopStartRunRequest, JumpHopStylePreset, JumpHopTileAsset,
|
||||||
JumpHopTileType, JumpHopWorkDetailResponse, JumpHopWorkMutationResponse,
|
JumpHopTileType, JumpHopWorkDetailResponse, JumpHopWorkMutationResponse,
|
||||||
JumpHopWorkProfileResponse, JumpHopWorkSummaryResponse, JumpHopWorksResponse,
|
JumpHopWorkProfileResponse, JumpHopWorkSummaryResponse, JumpHopWorksResponse,
|
||||||
|
|||||||
@@ -73,6 +73,7 @@ pub use self::external_generation::{
|
|||||||
ExternalGenerationJobClaimRecordInput, ExternalGenerationJobCompleteRecordInput,
|
ExternalGenerationJobClaimRecordInput, ExternalGenerationJobCompleteRecordInput,
|
||||||
ExternalGenerationJobEnqueueRecordInput, ExternalGenerationJobFailRecordInput,
|
ExternalGenerationJobEnqueueRecordInput, ExternalGenerationJobFailRecordInput,
|
||||||
ExternalGenerationJobRecord, ExternalGenerationJobRenewLeaseRecordInput,
|
ExternalGenerationJobRecord, ExternalGenerationJobRenewLeaseRecordInput,
|
||||||
|
ExternalGenerationQueueStatsRecord,
|
||||||
};
|
};
|
||||||
pub use self::jump_hop::{
|
pub use self::jump_hop::{
|
||||||
JumpHopActionRequest, JumpHopActionResponse, JumpHopActionType, JumpHopCharacterAsset,
|
JumpHopActionRequest, JumpHopActionResponse, JumpHopActionType, JumpHopCharacterAsset,
|
||||||
@@ -186,6 +187,7 @@ pub(crate) use self::custom_world::{
|
|||||||
};
|
};
|
||||||
pub(crate) use self::external_generation::{
|
pub(crate) use self::external_generation::{
|
||||||
map_external_generation_job_claim_result, map_external_generation_job_procedure_result,
|
map_external_generation_job_claim_result, map_external_generation_job_procedure_result,
|
||||||
|
map_external_generation_queue_stats_result,
|
||||||
};
|
};
|
||||||
pub(crate) use self::inventory::{
|
pub(crate) use self::inventory::{
|
||||||
map_runtime_inventory_state_procedure_result, map_runtime_item_reward_item_snapshot,
|
map_runtime_inventory_state_procedure_result, map_runtime_item_reward_item_snapshot,
|
||||||
|
|||||||
@@ -94,6 +94,30 @@ pub(crate) fn map_external_generation_job_claim_result(
|
|||||||
.collect())
|
.collect())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub(crate) fn map_external_generation_queue_stats_result(
|
||||||
|
result: ExternalGenerationQueueStatsProcedureResult,
|
||||||
|
) -> Result<ExternalGenerationQueueStatsRecord, SpacetimeClientError> {
|
||||||
|
if !result.ok {
|
||||||
|
return Err(SpacetimeClientError::procedure_failed(result.error_message));
|
||||||
|
}
|
||||||
|
|
||||||
|
let stats = result.stats.ok_or_else(|| {
|
||||||
|
SpacetimeClientError::missing_snapshot("external_generation queue stats 快照")
|
||||||
|
})?;
|
||||||
|
|
||||||
|
Ok(ExternalGenerationQueueStatsRecord {
|
||||||
|
pending_count: stats.pending_count,
|
||||||
|
delayed_pending_count: stats.delayed_pending_count,
|
||||||
|
claimable_pending_count: stats.claimable_pending_count,
|
||||||
|
running_active_count: stats.running_active_count,
|
||||||
|
expired_running_count: stats.expired_running_count,
|
||||||
|
terminal_count: stats.terminal_count,
|
||||||
|
claimable_count: stats.claimable_count,
|
||||||
|
oldest_claimable_age_micros: stats.oldest_claimable_age_micros,
|
||||||
|
now_micros: stats.now_micros,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
fn map_external_generation_job_snapshot(
|
fn map_external_generation_job_snapshot(
|
||||||
snapshot: ExternalGenerationJobSnapshot,
|
snapshot: ExternalGenerationJobSnapshot,
|
||||||
) -> ExternalGenerationJobRecord {
|
) -> ExternalGenerationJobRecord {
|
||||||
@@ -199,3 +223,16 @@ pub struct ExternalGenerationJobRecord {
|
|||||||
pub updated_at: String,
|
pub updated_at: String,
|
||||||
pub lease_token: Option<String>,
|
pub lease_token: Option<String>,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[derive(Clone, Debug, PartialEq, Eq)]
|
||||||
|
pub struct ExternalGenerationQueueStatsRecord {
|
||||||
|
pub pending_count: u32,
|
||||||
|
pub delayed_pending_count: u32,
|
||||||
|
pub claimable_pending_count: u32,
|
||||||
|
pub running_active_count: u32,
|
||||||
|
pub expired_running_count: u32,
|
||||||
|
pub terminal_count: u32,
|
||||||
|
pub claimable_count: u32,
|
||||||
|
pub oldest_claimable_age_micros: Option<i64>,
|
||||||
|
pub now_micros: i64,
|
||||||
|
}
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user