Skip to content

quiesce test should not compare wall timestamps durations with monotonic ones #9090

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
Sep 25, 2025
Merged

quiesce test should not compare wall timestamps durations with monotonic ones #9090

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fdcfbb0
quiesce test should not compare wall timestamps durations with monoto…
davepacheco Sep 25, 2025
b6e0e53
it should build
davepacheco Sep 25, 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
10 changes: 7 additions & 3 deletions nexus/src/app/quiesce.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -535,6 +535,7 @@ mod test {
use std::collections::BTreeSet;
use std::sync::Arc;
use std::time::Duration;
use std::time::Instant;
use tokio::sync::watch;
use uuid::Uuid;

Expand Down Expand Up @@ -571,6 +572,7 @@ mod test {

fn verify_quiesced(
before: DateTime<Utc>,
before_instant: Instant,
after: DateTime<Utc>,
status: QuiesceStatus,
) {
Expand Down Expand Up @@ -598,7 +600,7 @@ mod test {
assert!(duration_total >= duration_draining_sagas);
assert!(duration_total >= duration_draining_db);
assert!(duration_total >= duration_recording_quiesce);
assert!(duration_total <= (after - before).to_std().unwrap());
assert!(duration_total <= before_instant.elapsed());
assert!(status.sagas.sagas_pending.is_empty());
assert!(status.db_claims.is_empty());
}
Expand Down Expand Up @@ -643,14 +645,15 @@ mod test {
// If we quiesce the only Nexus while it's not doing anything, that
// should complete quickly.
let before = Utc::now();
let before_instant = Instant::now();
let _ = nexus_client
.quiesce_start()
.await
.expect("failed to start quiesce");
let rv =
wait_quiesce(log, &nexus_client, Duration::from_secs(30)).await;
let after = Utc::now();
verify_quiesced(before, after, rv);
verify_quiesced(before, before_instant, after, rv);
}

/// Exercise non-trivial app-level quiesce in an environment with just one
Expand Down Expand Up @@ -694,6 +697,7 @@ mod test {

// Start quiescing.
let before = Utc::now();
let before_instant = Instant::now();
let _ = nexus_client
.quiesce_start()
.await
Expand Down Expand Up @@ -801,7 +805,7 @@ mod test {
let rv =
wait_quiesce(log, &nexus_client, Duration::from_secs(30)).await;
let after = Utc::now();
verify_quiesced(before, after, rv);
verify_quiesced(before, before_instant, after, rv);

// Just to be sure, make sure we can neither create new saga nor access
// the database.
Expand Down
Loading