Merge branch 'main' into optimise-ram

This commit is contained in:
Audiobuzz
2026-07-03 21:53:18 +09:30
6 changed files with 301 additions and 10 deletions
+31
View File
@@ -688,6 +688,37 @@ must be built around **never restarting the process that holds live connections.
the current UKI), so auto-reap is safe; removal is still drain-gated +
grace-debounced. The loader + target share the RPC socket on a named volume
(`nvmf_tgt -r`); the loader reuses the SPDK image (has python3 + rpc.py).
- **BENCH FINDING 2026-07-03 (FIXED) — hosts did `connect-all`, so NO version
ever drained → auto-reap could never fire.** Observed: `spdk-release list`
showed more controllers than workstations, with every box appearing on *every*
served version's subsystem (e.g. 1/3/3/1/3 across 5 versions for ~3 boxes).
Root cause: the initramfs connected with **`nvme connect-all`** (test path
`nvmf-connect.sh`; secure path delegated to the dracut nvmf module's discovery
autoconnect), which attaches EVERY subsystem in the discovery log — the host
then mounts only its own by-UUID verity namespaces but leaves a live controller
on all the others. So each running host pinned every version above 0 conns, and
`spdk-loader`'s "auto-reap once drained (0 conns)" **could never trigger** while
the fleet was up — the served-version list grew without bound. This defeats the
whole drain/reap model, not just cosmetics. **Fix:** targeted connect. The
per-version subsystem NQN (`SUBNQN`, already in `verity.json .subnqn`) is now
also baked into the signed UKI cmdline as **`rd.nvmf.nqn=`** (`extract-artifacts.sh`),
and both connect paths use **`nvme connect -n <nqn>`** — `nvmf-connect.sh` (test)
and a new explicit step 6 in `dot1x-macsec-up.sh` (secure, replacing the module
delegation; runs after macsec0 is addressed per invariant #2). Legacy UKIs
without `rd.nvmf.nqn` fall back to `connect-all` (with a warning) so they still
boot. Now each host = 1 controller on its own subsystem → versions drain to 0
when their hosts move off → auto-reap works; connections scale O(hosts) not
O(hosts × versions). Requires a rebuild + re-sign (cmdline change, invariant #6).
**(a) TEST PATH BENCH-VERIFIED 2026-07-03 (commit `0bfe872`): builds, deploys, and
the host mounts ONLY ONE image** (its own version's subsystem) instead of connect-
all'ing every served version — the targeted `nvme connect -n rd.nvmf.nqn` works.
So each host now = 1 controller on its own subsystem, which is what lets old
versions drain to 0 and `spdk-loader` auto-reap. **Still to confirm:** the reap
payoff itself (migrate a host, watch its old version drain to 0 and get reaped);
(b) SECURE PATH — the new step-6 connect brings up the NVMe root over macsec0
(this path is not yet bench-confirmed end-to-end); (c) that the dracut nvmf module
isn't ALSO connect-all-ing on the secure path (if it is, suppress it — the targeted
connect is meant to be the sole connector).
- **BENCH FINDING 2026-07-03 (FIXED) — the target WAS still recreated on an
`IMAGE_VERSION` bump.** Despite the above, the `nvmeof` (spdk-target) service
still carried a versioned `type: image` bootstrap mount