Files
codex-app-server/cloud/pr_exec.py
T
host e31fcc6cba feat: G7 分层 fail-open/fail-closed + G8 Docker 轮询掐断 + G9 worker 忽略 host 预算 + G13/G14 归属(第三批)
- G7:认领门 closed 时查配额异常回 quota_check_unavailable、标 interrupted(可重试/续跑);轮询与轮次边界用 open,异常时回 quota_check_failed——新回合边界拒绝,执行中轮询经 _quota_hit 闭包过滤此串、只记 warning 不杀在跑任务,确认超限才掐断;查询函数本身不吞异常冒充不限额。
- G8:Docker 路径加 _docker_call_with_quota_poll(后台线程跑阻塞式 docker 调用,主循环每 quota_poll_interval_seconds 缺省 30 秒查一次,确认超限按容器名真杀容器,结果改写 quota_exceeded 走统一收尾:interrupted、成本照记、续跑消息保留,配额命中后不走 ALREADY_EXISTS 回落);同步路径保持边界检查。
- G9:worker 路径默认忽略 host max_daily_turns(host.py 顶层 --ignore-host-budget 只清该项,Local/Docker 执行器在子命令前追加,worker CLI 缺省开、--no-ignore-host-budget 关);standalone 直接跑 host.py 时预算照常。
- G13/G14:/pr 不再走 system 豁免,建任务前按请求用户查配额(402/503 均不排队不改状态),队列路 pr_jobs.created_by 记请求用户(老表 ALTER 补列),worker 跑 pr 任务时审计操作人用 created_by(老行回落 system)。注意:G14 原案的 system 豁免(服务端与 worker 写死)与 P1 冲突(P1:system 按普通属主走默认额度,不另设无限额系统预算),本次 rebase 未合入该豁免,system 豁免需另行决策。
- 配额口径与 P0/P1 对齐:无配额行按默认额度(非不限额),只有显式 NULL 行才不限额;无价上限只计 source='actual' 行;缺属主(含父任务回查仍无)拒绝新回合。
- README 配额节同步以上口径与 G15 接受现状(best-effort 超支、UTC 月切分、在跑任务只在轮询/轮次边界响应配额改动)。G4 与 G15 不在本批。
2026-10-28 11:14:10 +08:00

288 lines
11 KiB
Python
Raw Blame History

This file contains ambiguous Unicode characters
This file contains Unicode characters that might be confused with other characters. If you think that this is intentional, you can safely ignore this warning. Use the Escape button to reveal them.
"""跨主机 PR 执行(HA 阶段 1)。
背景:`/pr` 原来只在 server 进程内同步跑,worktree 从 server 本机
文件系统解析——server 与 worker 同主机是隐含前提。多机下任务的
worktree 可能在另一台主机上,server 本机根本没有那个目录。
本模块提供两条路(与 server 的 `/pr` 端点、worker 的 pr 任务循环
共用,逻辑只写一次):
- 同步路(worktree 在本机):`execute_task_pr` 直接跑,与旧端点
行为一致(写回 pr_url/pr_number、记审计 pr_created、成功发
review-requested、落盘失败发 merge-failed、跳过不发)。
- 队列路(worktree 在别机):`enqueue_pr_job` 把任务推进 `pr_jobs`
表;持有 worktree 的主机上的 local worker 每轮用 CAS 认领并跑
同一个 `execute_task_pr`,结果同样写回任务行。server 与 worker
之间不走新网络通道(不引 SSH 密钥分发),只复用已有的 DB 队列。
只有 local worker 跑 pr 任务:host-worktrees/ 与 tenants/ 在主机上
都可见(server 今天就是这么给 Docker 任务做 /pr 的),而容器内
worker 看不到 host-worktrees/,也不一定有 gh。Docker worker 跳过
pr 任务循环。
"""
import logging
import time
import uuid
from cloud.auth import AuthStore
from cloud.db import connect as _db_connect
from cloud.github_app import resolve_app_token
from cloud.pr import (PrSkipped, PrStepError, create_task_pr,
parse_git_remote_owner_repo)
from cloud.push import dispatch_event as _push_dispatch
_log = logging.getLogger("cloud.pr_exec")
def ensure_pr_jobs_table(conn):
"""幂等建 pr_jobs 表(workers/webhook_deliveries 同款懒建表模式)。
PG 适配层把 `?` 译成 `%s`、把 AUTOINCREMENT 译成 IDENTITY,
因此同一条 DDL 在 SQLite 与 Postgres 下都能跑;调用方在
enqueue/claim 前各调一次即可。
"""
conn.execute(
"CREATE TABLE IF NOT EXISTS pr_jobs("
"id TEXT PRIMARY KEY, task_id TEXT NOT NULL, "
"project_id TEXT NOT NULL, host TEXT NOT NULL, "
"status TEXT NOT NULL, pr_url TEXT, pr_number INTEGER, "
"error TEXT, created_at REAL, updated_at REAL, "
"started_at REAL, finished_at REAL, created_by TEXT)"
)
# 老表补列(G13:费用归属人):PRAGMA 经 db.py 适配层翻译,
# SQLite 与 Postgres 同款写法(见 automations.py 同款模式)。
try:
_cols = {row[1] for row in conn.execute(
"PRAGMA table_info(pr_jobs)").fetchall()}
except Exception:
_cols = set()
if "created_by" not in _cols:
try:
conn.execute(
"ALTER TABLE pr_jobs ADD COLUMN created_by TEXT")
except Exception:
pass
conn.commit()
def find_open_pr_job(conn, task_id):
"""找该任务未完成的 pr 任务(去重:同一任务同时只排一个)。
needs_local_worker 也算未完成:非 local worker 标记过的任务
仍在等 local worker 认领,再调 /pr 必须复用它,不能重排。"""
ensure_pr_jobs_table(conn)
row = conn.execute(
"SELECT * FROM pr_jobs WHERE task_id = ?"
" AND status IN ('queued', 'running', 'needs_local_worker')"
" ORDER BY created_at ASC LIMIT 1",
(task_id,)).fetchone()
if row is None:
return None
try:
return dict(row)
except (TypeError, ValueError):
# 裸 sqlite3 连接(无 Row 工厂)返回 tuple:dict() 对
# tuple 抛 ValueError(对 Row 抛 TypeError 的旧路径不动)。
return {"id": row[0], "task_id": row[1], "project_id": row[2],
"host": row[3], "status": row[4]}
def enqueue_pr_job(conn, task_id, project_id, host, created_by=None):
"""排一个 pr 任务(调用方已做去重)。返回 job id。
created_by(G13):请求 /pr 的用户 id,即费用归属人;
不传时为 None(老调用方 / 老行),worker 跑它时审计回
落到 "system"。server 的 _task_pr 队列路必传调用方。
"""
ensure_pr_jobs_table(conn)
job_id = uuid.uuid4().hex
now = time.time()
conn.execute(
"INSERT INTO pr_jobs(id, task_id, project_id, host, status,"
" created_at, updated_at, created_by)"
" VALUES(?, ?, ?, ?, 'queued', ?, ?, ?)",
(job_id, task_id, project_id, host, now, now, created_by))
conn.commit()
return job_id
def claim_pr_job(conn, host):
"""CAS 认领本主机的一个 pr 任务(最老优先)。
认领 queued 与 needs_local_worker 两种状态:后者是非 local
worker 标记的“需 local worker”任务,仍在等 local worker,
必须能被认领(否则标记等于搁置)。两个同主机 worker 抢
同一任务时只有一个能拿到 rowcount == 1。
返回任务 dict 或 None。
"""
ensure_pr_jobs_table(conn)
row = conn.execute(
"SELECT * FROM pr_jobs WHERE host = ?"
" AND status IN ('queued', 'needs_local_worker')"
" ORDER BY created_at ASC LIMIT 1",
(host,)).fetchone()
if row is None:
return None
try:
job_id = row["id"]
except TypeError:
# 裸 sqlite3 连接(无 Row 工厂)返回 tuple:按位置取。
# hasattr(__getitem__) 判据对 tuple 也为真,不能用它区分。
job_id = row[0]
now = time.time()
cur = conn.execute(
"UPDATE pr_jobs SET status = 'running', started_at = ?,"
" updated_at = ? WHERE id = ?"
" AND status IN ('queued', 'needs_local_worker')",
(now, now, job_id))
conn.commit()
if cur.rowcount != 1:
return None
try:
return dict(row)
except (TypeError, ValueError):
# 同上:tuple 行的 dict() 抛 ValueError。
return {"id": row[0], "task_id": row[1], "project_id": row[2],
"host": row[3], "status": "running"}
def mark_pr_job_needs_local_worker(conn, job_id, reason):
"""把 queued 的 pr 任务标为 needs_local_worker(CAS)。
只有仍是 queued 时才改写并返回 True;已被 local worker
认领(running)或已终态时返回 False,绝不覆盖。标记后
任务仍可被 local worker 认领(见 claim_pr_job),只是
重读时能看到它在等 local worker,而不是“没人处理”。
"""
ensure_pr_jobs_table(conn)
now = time.time()
cur = conn.execute(
"UPDATE pr_jobs SET status = 'needs_local_worker', error = ?,"
" updated_at = ? WHERE id = ? AND status = 'queued'",
(reason, now, job_id))
conn.commit()
return cur.rowcount == 1
def finish_pr_job(conn, job_id, status, pr_url=None, pr_number=None,
error=None):
"""写回 pr 任务终态(completed/failed)。"""
ensure_pr_jobs_table(conn)
now = time.time()
conn.execute(
"UPDATE pr_jobs SET status = ?, pr_url = ?, pr_number = ?,"
" error = ?, finished_at = ?, updated_at = ? WHERE id = ?",
(status, pr_url, pr_number, error, now, now, job_id))
conn.commit()
def _notify(project_id, event_type, payload, db_path):
"""PR 事件推送(best-effort,与 server._notify_pr_event 同语义)。"""
try:
result = _push_dispatch(db_path, event_type, project_id, payload)
except Exception as exc: # noqa: BLE001 -- 通知失败绝不炸 PR
_log.warning("pr notify %s failed: %s", event_type, exc)
return
if result.get("errors"):
_log.warning("pr notify %s errors: %s", event_type, result["errors"])
def execute_task_pr(db_path, task_id, user_id, worktrees_root=None,
git_runner=None, gh_runner=None, gh_which=None,
app_token_client=None, github_api=None):
"""给已 merged 的任务建 PR(同步执行体,server 端点与 worker 共用)。
步骤与旧 `_task_pr` 端点内联的逻辑一致:查项目 auto_pr/repo_url、
有 App 安装记录时现换 installation token 走 App 路径、否则走
gh + PAT;成功写回任务 pr_url/pr_number、记审计 pr_created、
发 review-requested;PrStepError 时发 merge-failed 后原样抛出;
PrSkipped 时不发任何事件、原样抛出。调用方按旧端点语义映射
响应(PrSkipped -> 200 pr_skipped,PrStepError -> 502)。
user_id:审计 pr_created 的操作人;server 端点传调用方,
worker 的 pr 任务循环传 job 的 created_by(G13),老行
没有 created_by 时回落 "system"(与 sweep 同款约定)。
token 只在本次调用内存里出现,不进库、不进日志。
"""
conn = _db_connect(str(db_path))
try:
row = conn.execute(
"SELECT * FROM tasks WHERE id = ?", (task_id,)).fetchone()
if row is None:
raise PrSkipped("task_not_found")
task = dict(row)
prow = conn.execute(
"SELECT auto_pr, repo_url FROM projects WHERE id = ?",
(task["project_id"],)).fetchone()
finally:
conn.close()
if task["status"] != "merged":
raise PrSkipped("not_merged")
auto_pr = 0
repo_url = None
if prow is not None:
try:
auto_pr = prow["auto_pr"] or 0
except (KeyError, IndexError, TypeError):
auto_pr = 0
try:
repo_url = prow["repo_url"]
except (KeyError, IndexError, TypeError):
repo_url = None
app_token = None
auth_via = "pat"
repo_full_name = None
if repo_url:
parsed = parse_git_remote_owner_repo(repo_url)
if parsed:
repo_full_name = "%s/%s" % parsed
if repo_full_name:
conn = _db_connect(str(db_path))
try:
app_token = resolve_app_token(
conn, repo_full_name, http_client=app_token_client)
except Exception:
app_token = None
finally:
conn.close()
if app_token:
auth_via = "app"
try:
result = create_task_pr(
task_id, auto_pr,
worktrees_root=worktrees_root,
git_runner=git_runner, gh_runner=gh_runner, gh_which=gh_which,
app_token=app_token, github_api=github_api)
except PrSkipped:
raise
except PrStepError as exc:
_notify(task["project_id"], "merge-failed",
{"task_id": task_id, "step": exc.step,
"error": exc.message}, db_path)
raise
now = time.time()
conn = _db_connect(str(db_path))
try:
conn.execute(
"UPDATE tasks SET pr_url = ?, pr_number = ?,"
" updated_at = ? WHERE id = ?",
(result["pr_url"], result["pr_number"], now, task_id))
conn.commit()
finally:
conn.close()
store = AuthStore(db_path)
try:
store.audit(user_id, task["project_id"], "pr_created",
result["pr_url"])
finally:
try:
store.conn.close()
except Exception:
pass
_notify(task["project_id"], "review-requested",
{"task_id": task_id, "pr_url": result["pr_url"],
"pr_number": result["pr_number"]}, db_path)
return {"pr_url": result["pr_url"], "pr_number": result["pr_number"],
"branch": result["branch"], "auth_via": auth_via}