resources: XCE_RESF_BUILTIN 从未被置位 — resources.yaml 加 builtin: true 声明式键
XCE_RESF_BUILTIN (0x01) 在生产链路上从未被任何一层置位:全树只有 types.h 定义、scheduler repl_info.c 显示表、一个测试 fixture 三处引用。worker init_builtin_load_indices()(mem/io/r1m…)、controller add_hostattrs_resvals()/ set_host_slots() 硬编码生产这些资源的值,但定义的 flags 从 YAML→capnp→wire 全程没人打这个位——CLI 的 BUILTIN 列对 mem/io/slots 等恒显 false,与 extlic 等用户资源无法区分。 - resources.schema.json(+xceadmin 打包副本,构建时从 src/configs/schema 同步):加 builtin: boolean 键 - mapping.py:RESOURCE_FLAG_BUILTIN=0x01,_build_resource 映射 builtin:true (与 consumable/release 同模式:缺省/false 不置位) - build.py dump:补渲染 builtin=True;顺手补同样一直缺失的 external=True (此前 EXTERNAL 池 dump 只显示 shared=true) - src/configs/resources.yaml:20 个硬编码生产者资源(slots + 11 load index + 8 host attributes)声明 builtin: true - golden fixture full/expected.bin 相应再生(6696→6856B,diff 恰为 20 行 builtin=True,非 builtin 行 0 差异) 验证:xceadmin 389 测试全绿(dev venv + meson build.dbg 各一遍);t1 实证: 树内 venv 重建 cluster.bin(与 live 逐行比对确认 delta 仅 builtin 20 行)→ config push gen=17 → apiserver 重启拾取(定义 store 只吃 join 时 config push,激活只 re-push scheduler)→ xcecli definition list -l mem/io/slots BUILTIN=true,extlic false、distribution/extlic 值/liccheck 作业 RUN→DONE 全链正常,5 daemon 健康。 Co-Authored-By: Claude Code <noreply@anthropic.com>
This commit is contained in:
parent
805288d747
commit
857f987f3c
8 changed files with 122 additions and 9 deletions
|
|
@ -49,6 +49,32 @@ def test_dump_lists_each_resource_with_decoded_type_and_order(full_cluster_bin):
|
|||
assert "consumable=False" in text
|
||||
|
||||
|
||||
def test_dump_renders_builtin_and_external_flags(full_cluster_bin):
|
||||
"""The flag bits that change a resource's semantics must be visible in a
|
||||
dump: builtin (worker/controller hardcode the values -- the repo fixture's
|
||||
load indices and host attributes) and external (values come only from the
|
||||
extres daemon's pushes -- the extlic pool shape). Both were silently
|
||||
invisible before: every builtin resource dumped as a plain user resource,
|
||||
and an external pool dumped as bare shared=true.
|
||||
"""
|
||||
text = build.dump_cluster_config(str(full_cluster_bin))
|
||||
mem_line = next(l for l in text.splitlines() if "name=mem type=numeric" in l)
|
||||
assert "builtin=True" in mem_line
|
||||
# a user-declared resource must not show a bare "builtin=" at all
|
||||
assert "builtin=False" not in text
|
||||
|
||||
import yaml as _yaml
|
||||
configs = str(FIXTURES_DIR / "full" / "configs")
|
||||
with open(configs + "/resources.yaml", encoding="utf-8") as fh:
|
||||
names = [r["name"] for r in _yaml.safe_load(fh)["resources"]
|
||||
if (r.get("resourcemap") or []) and
|
||||
(r["resourcemap"][0].get("location") or []) == ["external"]]
|
||||
assert names, "fixture must contain an external resource for this test"
|
||||
for name in names:
|
||||
line = next(l for l in text.splitlines() if f"name={name} " in l)
|
||||
assert "external=True" in line, line
|
||||
|
||||
|
||||
def test_dump_renders_mxj_auto_detect_sentinel_not_raw_uint32(full_cluster_bin):
|
||||
"""The exact bug that motivated this feature: hosts.yaml's `default`
|
||||
host has `max_slot: -1`, which wire-encodes as HOSTCONFIG_MXJ_AUTO_DETECT
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue