Add versioned script library, reconcile permit refusals and compact helper captures
This commit is contained in:
@@ -1764,12 +1764,8 @@ impl Agent {
|
||||
}
|
||||
let offer = jobs::requesting(self.journal.connection())?.context("UNSOLICITED_PERMIT")?;
|
||||
if !permit.denial_code.is_empty() {
|
||||
self.record(
|
||||
generation,
|
||||
&offer,
|
||||
"",
|
||||
Outcome::unknown("PERMIT_DENIED_RECONCILIATION_REQUIRED"),
|
||||
)?;
|
||||
jobs::denied_request(self.journal.connection(), &offer, &permit)?;
|
||||
self.close_gate();
|
||||
return Ok(());
|
||||
}
|
||||
if self.clock.reading().is_err() {
|
||||
@@ -2238,6 +2234,7 @@ impl Agent {
|
||||
self.queue_update_observation(generation)?;
|
||||
self.replay(&channel, generation).await?;
|
||||
let mut needs_sync = self.sync.is_some();
|
||||
let mut permit_after = Instant::now();
|
||||
if self.sync.is_some() && self.running.is_none() {
|
||||
if self.start_sync(&channel, generation).await.is_err() {
|
||||
self.close_gate();
|
||||
@@ -2285,7 +2282,7 @@ impl Agent {
|
||||
if self.sync.is_some() && !self.prepared && !self.helper_control_busy_for_sync() && rmm_agent_windows::job_readiness::refresh_due(needs_sync,sync_at.elapsed(),self.sync.as_ref().and_then(|s|s.validity_deadline()),self.clock.reading().ok().map(|r|r.upper)) {
|
||||
if self.start_sync(&channel,generation).await.is_err(){self.close_gate();needs_sync=true;}else{needs_sync=false;}sync_at=Instant::now();
|
||||
}
|
||||
if !needs_sync && !self.prepared && self.ready(generation) && jobs::events(self.journal.connection())?.is_empty() && self.journal.count()?==0 {
|
||||
if Instant::now() >= permit_after && !needs_sync && !self.prepared && self.ready(generation) && jobs::events(self.journal.connection())?.is_empty() && self.journal.count()?==0 {
|
||||
// A transiently stale clock skips this tick; it must not end the session.
|
||||
if let Ok(now)=self.clock.now() && let Some(offer)=jobs::next_at(self.journal.connection(),now)? {
|
||||
let job=self.binding.as_ref().context("JOB_BINDING_REQUIRED")?.job(&offer.payload_bytes)?;
|
||||
@@ -2320,7 +2317,13 @@ impl Agent {
|
||||
let fresh=jobs::accept(&tx,&binding,&offer,|_|supported)?;
|
||||
jobs::event(&tx,&accepted)?;tx.commit()?;needs_sync|=fresh;
|
||||
},
|
||||
Some(Payload::ExecutionPermit(permit))=>self.permit(generation,permit)?,
|
||||
Some(Payload::ExecutionPermit(permit))=> {
|
||||
if !permit.denial_code.is_empty() {
|
||||
needs_sync = true;
|
||||
permit_after = Instant::now() + Duration::from_secs(30);
|
||||
}
|
||||
self.permit(generation,permit)?;
|
||||
},
|
||||
Some(Payload::CancelRequest(cancel))=>{
|
||||
let row:Option<(Vec<u8>,String,String)>=self.journal.connection().query_row("SELECT offer,state,grant_id FROM job_attempts WHERE job=?1 AND attempt=?2",rusqlite::params![cancel.job_id,cancel.attempt_id],|r|Ok((r.get(0)?,r.get(1)?,r.get(2)?))).optional()?;
|
||||
if let Some((bytes,state,grant))=row {
|
||||
|
||||
Reference in New Issue
Block a user