hive-c0re: name an agent container after its machine, not "nixos"
Every agent container reports the hostname `nixos`, so every log line it ships carries that as its `_HOSTNAME`. Measured: host `muede-lpt2`, `hive-matrix` (declared as `containers.hive-matrix`) `hive-matrix`, and `h-atlas` `nixos`. nixpkgs sets the hostname in the merge function of the `containers.<name>.config` option (nixos-containers.nix:524), so it reaches a guest evaluated through that option and nothing else. Agent containers are `nixos-container create --flake meta#<name>` — an independent `nixosSystem` off the meta flake, which never evaluates that submodule. nspawn also names a container's hostname after the machine by default; that is ruled out as the source here, because `h-atlas`'s machine name is `h-atlas` and it reports `nixos`. The machine name rather than the logical one: `stats/otel_metrics.rs:345` already labels metrics `container.name = "h-<name>"`, so the logical name would make logs say `atlas` while metrics say `h-atlas` — a prefix transform on every join between the two signals. Declarative containers and nspawn both use the machine name too, so this is one rule with no exception for agents. The emission sits next to `hyperhive.user.name = name;`, which already derives the container's unix user from the agent name; the hostname was the one identity attr nobody wired. Also drops the prose in swarm-otel.nix and module-eval.nix that explained `_MACHINE_ID` by "every container is `nixos`" — that motivating example is what this commit removes, and the argument for `_MACHINE_ID` never depended on it. Checked before editing: nothing in the tree assumes the hostname is "nixos" (0 hits across *.rs and *.nix), and nothing reads the hostname at runtime. Gate: cargo fmt 0, clippy -D warnings 0, cargo test -p hive-c0re meta:: 0 (23 run, 22 passed, 1 ignored), nix fmt 0 changed. Refs #4304
This commit is contained in:
parent
4db746a22c
commit
2a02c76ad5
3 changed files with 52 additions and 10 deletions
|
|
@ -1260,6 +1260,15 @@ where
|
|||
# `hyperhive.user.name` match the agent's identity
|
||||
# instead of the harness default of `"agent"`.
|
||||
hyperhive.user.name = name;
|
||||
# Without this an agent container is called `nixos` and ships
|
||||
# every log line under that: nixpkgs sets the hostname from the
|
||||
# attr name in the `containers.<name>` submodule, and an
|
||||
# agent's system is its own `nixosSystem` off this flake, which
|
||||
# never evaluates that option. The machine name, not the
|
||||
# logical one — it is what `container.name` on our metrics and
|
||||
# nspawn itself already call this container, so logs join to
|
||||
# both without a prefix transform.
|
||||
networking.hostName = "h-${name}";
|
||||
hyperhive.claudeMemoryMaxBytes = memoryMaxBytes;
|
||||
programs.git.config.user = {
|
||||
name = name;
|
||||
|
|
@ -1760,6 +1769,42 @@ mod tests {
|
|||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn render_flake_names_each_agent_container_after_the_agent() {
|
||||
let out = render_flake(
|
||||
"github:example/hyperhive",
|
||||
"",
|
||||
"path:/nix/store/aaaa-nixpkgs-source",
|
||||
None,
|
||||
8000,
|
||||
"she/her",
|
||||
&std::collections::HashMap::new(),
|
||||
"4G",
|
||||
&[sample_spec("alice", false, 9001)],
|
||||
);
|
||||
assert!(
|
||||
out.contains(r#"networking.hostName = "h-${name}";"#),
|
||||
"an agent container with no hostname of its own is called `nixos`, \
|
||||
and ships every log line under that:\n{out}"
|
||||
);
|
||||
// The machine name `nixos-container` and our own metrics already use,
|
||||
// so a log line joins to a metric without a prefix transform.
|
||||
assert!(
|
||||
!out.contains("networking.hostName = name;"),
|
||||
"must be the machine name, not the logical one:\n{out}"
|
||||
);
|
||||
// Inside `mkAgent`'s module block, so it applies to every agent and
|
||||
// resolves to that agent's name — not emitted once at the top level.
|
||||
let mk = out.find("mkAgent = {").expect("mkAgent block");
|
||||
let host = out
|
||||
.find(r#"networking.hostName = "h-${name}";"#)
|
||||
.expect("hostname line");
|
||||
assert!(
|
||||
host > mk,
|
||||
"hostname must be emitted inside the per-agent module block:\n{out}"
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn render_flake_pins_claude_path_without_adding_an_input() {
|
||||
// The host-pinned claude travels as a bare store path assigned to
|
||||
|
|
|
|||
Loading…
Reference in a new issue