From aa92bf8814fe060a796eb41bcf86bad78fd6b4b5 Mon Sep 17 00:00:00 2001
From: Erwan Leboucher <erwanleboucher@gmail.com>
Date: Wed, 26 Aug 2026 15:29:15 +0200
Subject: [PATCH] fix(federation): Read the backoff window once when gating
 requests

---
 src/service/federation/mod.rs | 41 ++++++++++++++++++-----------------
 1 file changed, 21 insertions(+), 20 deletions(-)

diff --git a/src/service/federation/mod.rs b/src/service/federation/mod.rs
index c3ff6dfa9..e5fbb149d 100644
--- a/src/service/federation/mod.rs
+++ b/src/service/federation/mod.rs
@@ -142,26 +142,27 @@ pub fn mark_healthy(&self, server_name: &ServerName) -> bool {
 
 	/// Returns a rate-limited error if the remote is unhealthy.
 	fn ensure_remote_is_healthy(&self, server_name: &ServerName) -> Result<()> {
-		if self.is_healthy(server_name) {
-			Ok(())
-		} else {
-			let retry_after = self
-				.retry_after(server_name)
-				.expect("remote is unhealthy and must have an accompanying retry timestamp");
-			Err(Error::Request(
-				ErrorKind::LimitExceeded(assign!(LimitExceededErrorData::new(), {
-					retry_after: Some(RetryAfter::Delay(retry_after)),
-				})),
-				format!(
-					"Remote server {} is currently unhealthy (not retrying for another {} \
-					 seconds)",
-					server_name,
-					retry_after.as_secs()
-				)
-				.into(),
-				StatusCode::TOO_MANY_REQUESTS,
-			))
-		}
+		// Read the backoff window once. The remote can be marked healthy between two
+		// lookups.
+		let Some(retry_after) = self
+			.retry_after(server_name)
+			.filter(|retry_after| !retry_after.is_zero())
+		else {
+			return Ok(());
+		};
+
+		Err(Error::Request(
+			ErrorKind::LimitExceeded(assign!(LimitExceededErrorData::new(), {
+				retry_after: Some(RetryAfter::Delay(retry_after)),
+			})),
+			format!(
+				"Remote server {} is currently unhealthy (not retrying for another {} seconds)",
+				server_name,
+				retry_after.as_secs()
+			)
+			.into(),
+			StatusCode::TOO_MANY_REQUESTS,
+		))
 	}
 
 	/// Marks a destination as stale, which will cause the destination cache to