BrokerPort: cap the wait after a pending frame at a day

M3a review finding 8. The wait was expires plus the timeout with no bound,
and the "expiry too far away" guard could not fire, so a far expiry (which
brokerd produces when now + ttl_ms does not fit) parked a turn for ever.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
This commit is contained in:
2026-09-22 21:08:48 -07:00
co-authored by Claude Opus 5.5
parent 33994d0dc6
commit 70d582acf5
2 changed files with 76 additions and 1 deletions
+16 -1
View File
@@ -19,6 +19,9 @@ pub const UNAVAILABLE: &str = "the tool broker is unavailable";
pub const NOT_CONFIGURED: &str = "no tool broker is configured";
/// The failure a request too big for one frame reaches.
pub const TOO_LARGE: &str = "the request is too large for the tool broker";
/// The longest `BrokerPort` waits for an answer after a pending frame, whatever its `expires`
/// says, so a turn cannot be parked for ever by a far expiry.
pub const MAX_PENDING_WAIT: Duration = Duration::from_secs(24 * 60 * 60);
/// The runbook entry every outage line ends with.
pub const POINTER: &str = "see docs/runbook.md#broker-unavailable";
@@ -55,6 +58,7 @@ impl std::io::Read for Deadline<'_> {
pub struct BrokerPort {
socket: PathBuf,
timeout: Duration,
pending_cap: Duration,
log: Box<dyn Fn(&str) + Send + Sync>,
}
@@ -63,10 +67,19 @@ impl BrokerPort {
BrokerPort {
socket,
timeout,
pending_cap: MAX_PENDING_WAIT,
log: Box::new(|l| eprintln!("{l}")),
}
}
/// The same port with another cap on the wait after a pending frame (`MAX_PENDING_WAIT`).
pub fn with_pending_cap(self, pending_cap: Duration) -> BrokerPort {
BrokerPort {
pending_cap,
..self
}
}
pub fn with_log(
socket: PathBuf,
timeout: Duration,
@@ -75,6 +88,7 @@ impl BrokerPort {
BrokerPort {
socket,
timeout,
pending_cap: MAX_PENDING_WAIT,
log,
}
}
@@ -172,7 +186,8 @@ impl ToolPort for BrokerPort {
let wait = expires
.unix_millis()
.saturating_sub(Timestamp::now().unix_millis());
until = match Instant::now().checked_add(Duration::from_millis(wait)) {
let wait = Duration::from_millis(wait).min(self.pending_cap);
until = match Instant::now().checked_add(wait) {
Some(until) => until,
None => return self.unavailable("an expiry too far away"),
};