Skip to content

TUNE-449 Fix a potential duration overflow #1530

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

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

TUNE-449 Fix a potential duration overflow #1530

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
90d5da6
focused fix
abr-egn Nov 14, 2025
014d050
revised fix
abr-egn Nov 14, 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
15 changes: 9 additions & 6 deletions src/client.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -550,9 +550,12 @@ impl Client {

watcher.request_immediate_check();

let change_occurred = start_time.elapsed() < timeout
let elapsed = start_time.elapsed();
let change_occurred = elapsed < timeout
&& watcher
.wait_for_update(timeout - start_time.elapsed())
.wait_for_update(
timeout.checked_sub(elapsed).unwrap_or(Duration::ZERO),
)
.await;
if !change_occurred {
let error: Error = ErrorKind::ServerSelection {
Expand Down Expand Up @@ -613,10 +616,10 @@ impl Client {
if let Some(desc) = topology.description.primary() {
return Some(desc.clone());
}
if !watcher
.wait_for_update(timeout - start_time.elapsed())
.await
{
let remaining = timeout
.checked_sub(start_time.elapsed())
.unwrap_or(Duration::ZERO);
if !watcher.wait_for_update(remaining).await {
return None;
}
}
Expand Down