Retry Linux inventory when durable traffic delays collection
Rust development slice / linux (push) Failing after 8s
Rust development slice / linux (push) Failing after 8s
This commit is contained in:
@@ -482,10 +482,10 @@ impl<C: reconcile::SyncClock> Agent<C> {
|
|||||||
capabilities.dedup();
|
capabilities.dedup();
|
||||||
capabilities
|
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)
|
if self.inventory_inflight || !storage::passive_collection_ready(&self.db).unwrap_or(false)
|
||||||
{
|
{
|
||||||
return;
|
return false;
|
||||||
}
|
}
|
||||||
self.inventory_inflight = true;
|
self.inventory_inflight = true;
|
||||||
let sender = self.inventory_tx.clone();
|
let sender = self.inventory_tx.clone();
|
||||||
@@ -519,6 +519,7 @@ impl<C: reconcile::SyncClock> Agent<C> {
|
|||||||
});
|
});
|
||||||
let _ = sender.blocking_send(result);
|
let _ = sender.blocking_send(result);
|
||||||
});
|
});
|
||||||
|
true
|
||||||
}
|
}
|
||||||
fn queue_update_observation(&mut self, generation: u64) -> Result<()> {
|
fn queue_update_observation(&mut self, generation: u64) -> Result<()> {
|
||||||
if !storage::passive_collection_ready(&self.db)? {
|
if !storage::passive_collection_ready(&self.db)? {
|
||||||
@@ -752,10 +753,10 @@ impl<C: reconcile::SyncClock> Agent<C> {
|
|||||||
let decoded=proof.decode().map_err(anyhow::Error::msg)?;
|
let decoded=proof.decode().map_err(anyhow::Error::msg)?;
|
||||||
let event:Option<rmm_updater_handoff::Event>=decoded.events.last().map(|raw|serde_json::from_slice(raw)).transpose()?;
|
let event:Option<rmm_updater_handoff::Event>=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 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
|
// Fixed update health includes one genuinely new
|
||||||
// normal base sample, never a fresh timestamp on old data.
|
// 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() {
|
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;}}
|
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<C: reconcile::SyncClock> Agent<C> {
|
|||||||
heartbeat_at = Instant::now();
|
heartbeat_at = Instant::now();
|
||||||
heartbeat_after = Duration::from_millis(rand::random_range(27_000..33_000));
|
heartbeat_after = Duration::from_millis(rand::random_range(27_000..33_000));
|
||||||
}
|
}
|
||||||
if inventory_at.elapsed() >= Duration::from_secs(60) {
|
// A simultaneous update report can fill the durable queue. Keep
|
||||||
self.queue_inventory();
|
// inventory due until collection actually starts.
|
||||||
|
if inventory_at.elapsed() >= Duration::from_secs(60) && self.queue_inventory() {
|
||||||
inventory_at = Instant::now();
|
inventory_at = Instant::now();
|
||||||
}
|
}
|
||||||
if rotation_at.elapsed() >= Duration::from_secs(30) {
|
if rotation_at.elapsed() >= Duration::from_secs(30) {
|
||||||
|
|||||||
Reference in New Issue
Block a user