myxce

lei.chen/myxce

Fork 1

Commit graph

Author	SHA1	Message	Date
lei.chen	857f987f3c	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>	2026-10-28 01:46:21 +00:00
Rongsong Shen	3afe3d5549	feat(xceadmin): add 'config dump' command and size-string thresholds Adds `xceadmin config dump CLUSTER_BIN_PATH`, the reverse of `config build` -- decodes a serialized ClusterConfig back to human-readable text so a built config can be inspected without a throwaway pycapnp script. Motivated directly by how bug-1556 (hosts.yaml's max_slot: -1 auto-detect sentinel silently becoming mxj=0) was actually found: by hand-decoding a live cluster.bin. The dump renders the same sentinel as "max_slot=-1 (auto-detect from CPU count)", not the raw uint32. Also adds parse_size_or_number() to xcecommon.mapping so a queue/host's sched_stop threshold on a byte-valued resource (maxmem/mem/tmp/maxswap/ maxtmp) can be written as a human-friendly size string ("500MB", "2GB") instead of a raw byte count; a plain number still passes through unchanged for non-byte resources like load averages. hosts.schema.json and queues.schema.json's sched_stop schema gains a matching SizeOrNumber type. dump_cluster_config() humanizes the same byte-valued thresholds back on the way out (_format_bytes_human). New ClusterBinFileError covers every local cluster.bin read/decode failure mode without letting a raw OSError/capnp.KjException escape the CLI. RESOURCE_VALTYPE/RESOURCE_ORDTYPE/RESOURCE_FLAG_* made public in mapping.py so dump_cluster_config can reuse the same int<->name tables build_cluster_config already uses, keeping both directions in sync by construction. 256 xceadmin tests pass (incl. new test_config_dump.py and the parse_size_or_number/SizeOrNumber cases in test_mapping.py/test_cli.py), verified via `xce-build.sh xceadmin`'s full pinned out-of-tree install + pytest run before this commit. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>	2026-08-16 03:56:52 +00:00

Author

SHA1

Message

Date

lei.chen

857f987f3c

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>

2026-10-28 01:46:21 +00:00

Rongsong Shen

3afe3d5549

feat(xceadmin): add 'config dump' command and size-string thresholds

Adds `xceadmin config dump CLUSTER_BIN_PATH`, the reverse of `config
build` -- decodes a serialized ClusterConfig back to human-readable text
so a built config can be inspected without a throwaway pycapnp script.
Motivated directly by how bug-1556 (hosts.yaml's max_slot: -1 auto-detect
sentinel silently becoming mxj=0) was actually found: by hand-decoding a
live cluster.bin. The dump renders the same sentinel as
"max_slot=-1 (auto-detect from CPU count)", not the raw uint32.

Also adds parse_size_or_number() to xcecommon.mapping so a queue/host's
sched_stop threshold on a byte-valued resource (maxmem/mem/tmp/maxswap/
maxtmp) can be written as a human-friendly size string ("500MB", "2GB")
instead of a raw byte count; a plain number still passes through
unchanged for non-byte resources like load averages. hosts.schema.json
and queues.schema.json's sched_stop schema gains a matching SizeOrNumber
type. dump_cluster_config() humanizes the same byte-valued thresholds
back on the way out (_format_bytes_human).

New ClusterBinFileError covers every local cluster.bin read/decode
failure mode without letting a raw OSError/capnp.KjException escape the
CLI. RESOURCE_VALTYPE/RESOURCE_ORDTYPE/RESOURCE_FLAG_* made public in
mapping.py so dump_cluster_config can reuse the same int<->name tables
build_cluster_config already uses, keeping both directions in sync by
construction.

256 xceadmin tests pass (incl. new test_config_dump.py and the
parse_size_or_number/SizeOrNumber cases in test_mapping.py/test_cli.py),
verified via `xce-build.sh xceadmin`'s full pinned out-of-tree install
+ pytest run before this commit.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>

2026-08-16 03:56:52 +00:00

2 commits