diff --git a/crates/agent/src/main.rs b/crates/agent/src/main.rs index 97ff86f..44cbb0f 100644 --- a/crates/agent/src/main.rs +++ b/crates/agent/src/main.rs @@ -482,10 +482,10 @@ impl Agent { capabilities.dedup(); capabilities } - fn queue_inventory(&mut self) { + fn queue_inventory(&mut self) -> bool { if self.inventory_inflight || !storage::passive_collection_ready(&self.db).unwrap_or(false) { - return; + return false; } self.inventory_inflight = true; let sender = self.inventory_tx.clone(); @@ -519,6 +519,7 @@ impl Agent { }); let _ = sender.blocking_send(result); }); + true } fn queue_update_observation(&mut self, generation: u64) -> Result<()> { if !storage::passive_collection_ready(&self.db)? { @@ -752,10 +753,10 @@ impl Agent { let decoded=proof.decode().map_err(anyhow::Error::msg)?; let event:Option=decoded.events.last().map(|raw|serde_json::from_slice(raw)).transpose()?; if event.is_some_and(|event|matches!(event.evidence,rmm_updater_handoff::Evidence::ServicesStarted{..}|rmm_updater_handoff::Evidence::RollbackServicesStarted{..})) { - if health_inventory_prefix.as_deref()!=Some(proof.head_sha256.as_str()) { + if health_inventory_prefix.as_deref()!=Some(proof.head_sha256.as_str()) && self.queue_inventory() { // Fixed update health includes one genuinely new // normal base sample, never a fresh timestamp on old data. - self.queue_inventory();health_inventory_prefix=Some(proof.head_sha256.clone()); + health_inventory_prefix=Some(proof.head_sha256.clone()); } if health_task.is_none() && self.prepared.is_none() { match self.start_update_health(proof) {Ok(task)=>health_task=task,Err(error)=>{report_closed_gate(&error);self.close_gate();needs_sync=true;}} @@ -842,8 +843,9 @@ impl Agent { heartbeat_at = Instant::now(); heartbeat_after = Duration::from_millis(rand::random_range(27_000..33_000)); } - if inventory_at.elapsed() >= Duration::from_secs(60) { - self.queue_inventory(); + // A simultaneous update report can fill the durable queue. Keep + // inventory due until collection actually starts. + if inventory_at.elapsed() >= Duration::from_secs(60) && self.queue_inventory() { inventory_at = Instant::now(); } if rotation_at.elapsed() >= Duration::from_secs(30) {