Skip to content

Commit f0cd820

Browse files
shengyfuCopilot
andcommitted
Make managed timer tests independent of clock epoch
Co-authored-by: Copilot App <[email protected]> Copilot-Session: 9776b17f-6a2d-4c47-9e89-0f8113d14b95
1 parent 187a0db commit f0cd820

2 files changed

Lines changed: 50 additions & 36 deletions

File tree

‎tgrep-cli/src/serve/shared/managed.rs‎

Lines changed: 26 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1084,26 +1084,20 @@ impl State {
10841084
return Err(Error::invalid("test timer exceeds one day").into());
10851085
}
10861086
let slot = self.views.slot(&input.view)?;
1087-
let monitor = self
1087+
if !self
10881088
.monitors
10891089
.lock()
10901090
.map_err(|_| Error::corrupt("monitor registry poisoned"))?
1091-
.get(&input.view)
1092-
.cloned()
1093-
.ok_or_else(|| Error::invalid("view has no monitor"))?;
1091+
.contains_key(&input.view)
10941092
{
1095-
let mut monitor = monitor
1096-
.lock()
1097-
.map_err(|_| Error::corrupt("monitor poisoned"))?;
1098-
let now = Instant::now();
1099-
monitor.last_reconcile = now
1100-
.checked_sub(Duration::from_millis(input.elapsed_ms))
1101-
.ok_or_else(|| Error::invalid("test timer is out of range"))?;
1102-
monitor.last_schedule = now
1103-
.checked_sub(Duration::from_secs(30))
1104-
.ok_or_else(|| Error::invalid("test retry timer is out of range"))?;
1093+
return Err(Error::invalid("view has no monitor").into());
11051094
}
1106-
self.schedule_view(&slot)?;
1095+
self.schedule_view_with_elapsed(&slot, |_| {
1096+
(
1097+
Duration::from_secs(30),
1098+
Duration::from_millis(input.elapsed_ms),
1099+
)
1100+
})?;
11071101
Ok(json!({"input_epoch":slot.input_epoch()}))
11081102
}
11091103
#[cfg(feature = "managed-test-hooks")]
@@ -1468,6 +1462,19 @@ impl State {
14681462
}
14691463

14701464
fn schedule_view(&self, slot: &Arc<ViewSlot>) -> Result<()> {
1465+
self.schedule_view_with_elapsed(slot, |monitor| {
1466+
(
1467+
monitor.last_schedule.elapsed(),
1468+
monitor.last_reconcile.elapsed(),
1469+
)
1470+
})
1471+
}
1472+
1473+
fn schedule_view_with_elapsed(
1474+
&self,
1475+
slot: &Arc<ViewSlot>,
1476+
elapsed: impl FnOnce(&Monitor) -> (Duration, Duration),
1477+
) -> Result<()> {
14711478
let status = self.views.status(slot.id())?;
14721479
if status.leases == 0 {
14731480
return Ok(());
@@ -1526,10 +1533,9 @@ impl State {
15261533
return Ok(());
15271534
}
15281535
let retry = Duration::from_millis(200_u64.saturating_mul(1_u64 << monitor.failures.min(7)));
1529-
let elapsed = monitor.last_schedule.elapsed();
1530-
let periodic = self.watches.polling(&monitor)
1531-
&& monitor.last_reconcile.elapsed() >= self.watches.interval;
1532-
if (!status.ready || periodic) && elapsed >= retry {
1536+
let (schedule_elapsed, reconcile_elapsed) = elapsed(&monitor);
1537+
let periodic = self.watches.polling(&monitor) && reconcile_elapsed >= self.watches.interval;
1538+
if (!status.ready || periodic) && schedule_elapsed >= retry {
15331539
monitor.last_schedule = Instant::now();
15341540
drop(monitor);
15351541
if periodic {
@@ -1545,7 +1551,7 @@ impl State {
15451551
)?;
15461552
self.enqueue(&operation)?;
15471553
} else if status.ready
1548-
&& elapsed >= retry
1554+
&& schedule_elapsed >= retry
15491555
&& matches!(
15501556
self.namespace.policy()?.policy.advancement,
15511557
managed::policy::Advancement::Adaptive { .. }

‎tgrep-cli/tests/shared_daemon/managed_live.rs‎

Lines changed: 24 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -876,7 +876,7 @@ fn native_failure_enables_polling_only_for_the_affected_view() {
876876
"testing.watch-event",
877877
json!({"view":fallback["view"],"kind":"failure"}),
878878
);
879-
let before = wait_for(
879+
let mut before = wait_for(
880880
&daemon,
881881
"views.status",
882882
json!({"id":fallback["view"]}),
@@ -918,23 +918,31 @@ fn native_failure_enables_polling_only_for_the_affected_view() {
918918
}
919919

920920
fs::write(fixture.b.join("missed.txt"), "shared_term fallback_poll\n").unwrap();
921-
let timer = daemon.rpc(
921+
let not_due = daemon.rpc(
922922
"testing.reconcile-timer",
923-
json!({"view":fallback["view"],"elapsed_ms":121_000}),
923+
json!({"view":fallback["view"],"elapsed_ms":119_999}),
924924
);
925-
assert!(timer["input_epoch"].as_u64().unwrap() > before["input_epoch"].as_u64().unwrap());
926-
let repaired = wait_for(
927-
&daemon,
928-
"views.status",
929-
json!({"id":fallback["view"]}),
930-
|status| {
931-
status["ready"] == true
932-
&& status["authoritative"]["input_epoch"].as_u64().unwrap()
933-
>= timer["input_epoch"].as_u64().unwrap()
934-
},
935-
);
936-
assert_eq!(repaired["last_reconcile"]["full"], true);
937-
assert_eq!(repaired["last_reconcile"]["content_reads_avoided"], 0);
925+
assert_eq!(not_due["input_epoch"], before["input_epoch"]);
926+
for elapsed_ms in [120_000, 121_000, 86_400_000] {
927+
let timer = daemon.rpc(
928+
"testing.reconcile-timer",
929+
json!({"view":fallback["view"],"elapsed_ms":elapsed_ms}),
930+
);
931+
assert!(timer["input_epoch"].as_u64().unwrap() > before["input_epoch"].as_u64().unwrap());
932+
before = wait_for(
933+
&daemon,
934+
"views.status",
935+
json!({"id":fallback["view"]}),
936+
|status| {
937+
status["ready"] == true
938+
&& status["work"].is_null()
939+
&& status["authoritative"]["input_epoch"].as_u64().unwrap()
940+
>= timer["input_epoch"].as_u64().unwrap()
941+
},
942+
);
943+
assert_eq!(before["last_reconcile"]["full"], true);
944+
assert_eq!(before["last_reconcile"]["content_reads_avoided"], 0);
945+
}
938946
assert_scan_parity(&daemon, &fixture.b, fixture.temp.path());
939947
for lease in ["managed-client", "sibling-client"] {
940948
daemon.rpc("views.detach", json!({"owner":claim.owner,"lease":lease}));

0 commit comments

Comments
 (0)