feat(#2302): thread &Ident through agent path builders
This commit is contained in:
parent
1286029947
commit
bf644cc126
23 changed files with 168 additions and 85 deletions
|
|
@ -115,7 +115,7 @@ async fn du_bytes(path: &std::path::Path) -> Option<u64> {
|
|||
/// agent's state-dir contribution was 0; with the writable rootfs nearly empty
|
||||
/// (almost everything is bind-mounted), that surfaced as all agents reporting
|
||||
/// 0 disk.
|
||||
async fn measure_agent_disk(name: &str) -> u64 {
|
||||
async fn measure_agent_disk(name: &hive_host_sock::Ident) -> u64 {
|
||||
let state_dir = Coordinator::agent_notes_dir(name);
|
||||
let rootfs = PathBuf::from(format!("{NIXOS_CONTAINERS_ROOT}/h-{name}"));
|
||||
let mut total = 0u64;
|
||||
|
|
@ -136,7 +136,7 @@ pub async fn disk_sampler_loop() {
|
|||
for name in Coordinator::kept_state_names() {
|
||||
let bytes = measure_agent_disk(&name).await;
|
||||
if let Ok(mut cache) = disk_cache().write() {
|
||||
cache.insert(name, bytes);
|
||||
cache.insert(name.into_string(), bytes);
|
||||
}
|
||||
}
|
||||
sleep(DISK_SAMPLE_INTERVAL).await;
|
||||
|
|
@ -240,7 +240,9 @@ pub async fn gather() -> Vec<ContainerResource> {
|
|||
.into_iter()
|
||||
.filter_map(|name| {
|
||||
let dir = scope_dir(&format!("h-{name}"));
|
||||
dir.join("cpu.stat").exists().then_some((name, dir))
|
||||
dir.join("cpu.stat")
|
||||
.exists()
|
||||
.then_some((name.into_string(), dir))
|
||||
})
|
||||
.collect();
|
||||
|
||||
|
|
|
|||
|
|
@ -366,7 +366,7 @@ pub fn hive_snapshot(window: Window, prices: &PriceTable) -> HiveStats {
|
|||
*bash_mix.entry(h.clone()).or_insert(0) += c;
|
||||
}
|
||||
agents.push(AgentRollup {
|
||||
name,
|
||||
name: name.into_string(),
|
||||
turns: agg.turns,
|
||||
input_tokens: agg.input,
|
||||
output_tokens: agg.output,
|
||||
|
|
|
|||
Loading…
Reference in a new issue