Permit proven closed-control fresh sync and retry only precommit clock reads
Rust development slice / linux (push) Failing after 6s
Rust development slice / linux (push) Failing after 6s
This commit is contained in:
@@ -1448,13 +1448,37 @@ impl Agent {
|
||||
helper: Option<&reconcile::HelperSnapshot>,
|
||||
) -> Result<()> {
|
||||
let context = self.channel(generation)?;
|
||||
let closed_control_idle = {
|
||||
#[cfg(feature = "system-helper")]
|
||||
{
|
||||
self.running.is_none()
|
||||
&& !self.prepared
|
||||
&& self.deferred_sync.is_none()
|
||||
&& self.deferred_permit.is_none()
|
||||
&& self.helper_control.is_none()
|
||||
&& self.helper_probe.is_none()
|
||||
&& helper.is_some()
|
||||
&& (if Path::new(rmm_agent_windows::helper_runtime::intent::DB).exists() {
|
||||
rmm_agent_windows::helper_runtime::intent::Store::open(false)
|
||||
.and_then(|store| store.pending())
|
||||
.is_ok_and(|pending| pending.is_empty())
|
||||
} else {
|
||||
helper.is_some_and(|snapshot| snapshot.attempts.is_empty())
|
||||
})
|
||||
}
|
||||
#[cfg(not(feature = "system-helper"))]
|
||||
{
|
||||
false
|
||||
}
|
||||
};
|
||||
let sync = self.sync.as_mut().context("SYNC_NOT_CONFIGURED")?;
|
||||
let prepared = sync.prepare(
|
||||
let prepared = sync.prepare_with_closed_control_idle(
|
||||
self.journal.connection_mut(),
|
||||
self.ledger.as_ref().context("LEDGER_REQUIRED")?,
|
||||
context,
|
||||
helper,
|
||||
&self.clock,
|
||||
closed_control_idle,
|
||||
);
|
||||
#[cfg(feature = "system-helper")]
|
||||
if helper.is_some()
|
||||
|
||||
Reference in New Issue
Block a user