Skip to content

fix: use None for unlimited retry deadline instead of a large duration #1155

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 6, 2025
Merged

fix: use None for unlimited retry deadline instead of a large duration #1155

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
edb3921
fix: use `None` for unlimited retry deadline instead of a large duration
georgeh0 Oct 6, 2025
b2b1f86
Update src/utils/retryable.rs
georgeh0 Oct 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/execution/live_updater.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ impl SourceUpdateTask {
async move {
let mut change_stream = change_stream;
let retry_options = retryable::RetryOptions {
retry_timeout: std::time::Duration::from_secs(365 * 24 * 60 * 60),
retry_timeout: None,
initial_backoff: std::time::Duration::from_secs(5),
max_backoff: std::time::Duration::from_secs(60),
};
Expand Down
32 changes: 21 additions & 11 deletions src/utils/retryable.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,23 +80,23 @@ pub fn Ok<T>(value: T) -> Result<T> {
}

pub struct RetryOptions {
pub retry_timeout: Duration,
pub retry_timeout: Option<Duration>,
pub initial_backoff: Duration,
pub max_backoff: Duration,
}

impl Default for RetryOptions {
fn default() -> Self {
Self {
retry_timeout: DEFAULT_RETRY_TIMEOUT,
retry_timeout: Some(DEFAULT_RETRY_TIMEOUT),
initial_backoff: Duration::from_millis(100),
max_backoff: Duration::from_secs(10),
}
}
}

pub static HEAVY_LOADED_OPTIONS: RetryOptions = RetryOptions {
retry_timeout: DEFAULT_RETRY_TIMEOUT,
retry_timeout: Some(DEFAULT_RETRY_TIMEOUT),
initial_backoff: Duration::from_secs(1),
max_backoff: Duration::from_secs(60),
};
Expand All @@ -110,8 +110,9 @@ pub async fn run<
f: F,
options: &RetryOptions,
) -> Result<Ok, Err> {
let start_time = Instant::now();
let deadline = start_time + options.retry_timeout;
let deadline = options
.retry_timeout
.map(|timeout| Instant::now() + timeout);
let mut backoff = options.initial_backoff;

loop {
Expand All @@ -121,13 +122,22 @@ pub async fn run<
if !err.is_retryable() {
return Result::Err(err);
}
let now = Instant::now();
if now >= deadline {
return Result::Err(err);
let mut sleep_duration = backoff;
if let Some(deadline) = deadline {
let now = Instant::now();
if now >= deadline {
return Result::Err(err);
}
let remaining_time = deadline.saturating_duration_since(now);
if remaining_time < sleep_duration {
sleep_duration = remaining_time;
}
}
trace!("Will retry in {}ms for error: {}", backoff.as_millis(), err);
let remaining_time = deadline.saturating_duration_since(now);
let sleep_duration = std::cmp::min(backoff, remaining_time);
trace!(
"Will retry in {}ms for error: {}",
sleep_duration.as_millis(),
err
);
tokio::time::sleep(sleep_duration).await;
if backoff < options.max_backoff {
backoff = std::cmp::min(
Expand Down