Skip to content

tests/unhealthy_database: Migrate from sync to async database pools #8441

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 1 commit into from
Apr 10, 2024
Merged

tests/unhealthy_database: Migrate from sync to async database pools #8441

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
43 changes: 22 additions & 21 deletions src/tests/unhealthy_database.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,22 @@
use crate::util::{RequestHelper, TestApp};
use deadpool_diesel::postgres::Pool;
use deadpool_diesel::Timeouts;
use http::StatusCode;
use std::time::Duration;

const DB_HEALTHY_TIMEOUT: Duration = Duration::from_millis(2000);

fn default_timeouts() -> Timeouts {
Timeouts::wait_millis(DB_HEALTHY_TIMEOUT.as_millis() as u64)
}

fn wait_until_healthy(pool: &Pool, app: &TestApp) {
let _ = app
.runtime()
.block_on(pool.timeout_get(&default_timeouts()))
.expect("the database did not return healthy");
}

#[test]
fn http_error_with_unhealthy_database() {
let (app, anon) = TestApp::init().with_chaos_proxy().empty();
Expand All @@ -17,10 +30,7 @@ fn http_error_with_unhealthy_database() {
assert_eq!(response.status(), StatusCode::SERVICE_UNAVAILABLE);

app.primary_db_chaosproxy().restore_networking().unwrap();
app.as_inner()
.primary_database
.wait_until_healthy(DB_HEALTHY_TIMEOUT)
.expect("the database did not return healthy");
wait_until_healthy(&app.as_inner().deadpool_primary, &app);

let response = anon.get::<()>("/api/v1/summary");
assert_eq!(response.status(), StatusCode::OK);
Expand All @@ -43,10 +53,7 @@ fn fallback_to_replica_returns_user_info() {

// restore primary database connection
app.primary_db_chaosproxy().restore_networking().unwrap();
app.as_inner()
.primary_database
.wait_until_healthy(DB_HEALTHY_TIMEOUT)
.expect("the database did not return healthy");
wait_until_healthy(&app.as_inner().deadpool_primary, &app);
}

#[test]
Expand All @@ -67,22 +74,19 @@ fn restored_replica_returns_user_info() {

// Once the replica database is restored, it should serve as a fallback again
app.replica_db_chaosproxy().restore_networking().unwrap();
app.as_inner()
.read_only_replica_database
let replica = app
.as_inner()
.deadpool_replica
.as_ref()
.expect("no replica database configured")
.wait_until_healthy(DB_HEALTHY_TIMEOUT)
.expect("the database did not return healthy");
.expect("no replica database configured");
wait_until_healthy(replica, &app);

let response = owner.get::<()>(URL);
assert_eq!(response.status(), StatusCode::OK);

// restore connection
app.primary_db_chaosproxy().restore_networking().unwrap();
app.as_inner()
.primary_database
.wait_until_healthy(DB_HEALTHY_TIMEOUT)
.expect("the database did not return healthy");
wait_until_healthy(&app.as_inner().deadpool_primary, &app);
}

#[test]
Expand All @@ -103,10 +107,7 @@ fn restored_primary_returns_user_info() {

// Once the replica database is restored, it should serve as a fallback again
app.primary_db_chaosproxy().restore_networking().unwrap();
app.as_inner()
.primary_database
.wait_until_healthy(DB_HEALTHY_TIMEOUT)
.expect("the database did not return healthy");
wait_until_healthy(&app.as_inner().deadpool_primary, &app);

let response = owner.get::<()>(URL);
assert_eq!(response.status(), StatusCode::OK);
Expand Down