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 不在本批。
This commit is contained in:
1 parent
5883169c82
commit
e31fcc6cba
11 files changed
+786
-176
No files matched your search
@@ -26,7 +26,8 @@ try:
|
||||
from cloud.autoscaler import Autoscaler
|
||||
from cloud.db import connect as _db_connect
|
||||
from cloud.pr_exec import (claim_pr_job, enqueue_pr_job,
|
||||
find_open_pr_job, finish_pr_job)
|
||||
ensure_pr_jobs_table, find_open_pr_job,
|
||||
finish_pr_job)
|
||||
from cloud.server import create_server, migrate_tasks_table
|
||||
from cloud.worker import Worker
|
||||
except ImportError:
|
||||
@@ -105,6 +106,46 @@ class PrJobsTableTestCase(unittest.TestCase):
|
||||
finally:
|
||||
conn.close()
|
||||
|
||||
# -- G13:队列记费用归属人 + 老表补列 --------------------------------
|
||||
def test_enqueue_records_created_by(self):
|
||||
conn = _db_connect(self.db_path)
|
||||
try:
|
||||
enqueue_pr_job(conn, "t1", "p1", "host-a",
|
||||
created_by="user-9")
|
||||
job = find_open_pr_job(conn, "t1")
|
||||
self.assertEqual(job["created_by"], "user-9")
|
||||
# 不传时为 None(老调用方),worker 回落 system。
|
||||
enqueue_pr_job(conn, "t2", "p1", "host-a")
|
||||
self.assertIsNone(find_open_pr_job(conn, "t2")["created_by"])
|
||||
finally:
|
||||
conn.close()
|
||||
|
||||
def test_old_table_migration_adds_created_by(self):
|
||||
conn = sqlite3.connect(self.db_path)
|
||||
try:
|
||||
conn.execute(
|
||||
"CREATE TABLE 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)")
|
||||
conn.commit()
|
||||
finally:
|
||||
conn.close()
|
||||
conn = _db_connect(self.db_path)
|
||||
try:
|
||||
ensure_pr_jobs_table(conn)
|
||||
cols = {row[1] for row in conn.execute(
|
||||
"PRAGMA table_info(pr_jobs)").fetchall()}
|
||||
self.assertIn("created_by", cols)
|
||||
# 补列后照常排队并记归属人。
|
||||
enqueue_pr_job(conn, "t1", "p1", "host-a",
|
||||
created_by="user-9")
|
||||
self.assertEqual(
|
||||
find_open_pr_job(conn, "t1")["created_by"], "user-9")
|
||||
finally:
|
||||
conn.close()
|
||||
|
||||
|
||||
class WorktreeHostMigrationTestCase(unittest.TestCase):
|
||||
def setUp(self):
|
||||
|
||||
Reference in new issue
Block a user