Plumb log

oxidecomputer · Jun 17, 2024 · 72369bb · 72369bb
1 parent 88f67aa
commit 72369bb
Show file tree

Hide file tree

Showing 22 changed files with 118 additions and 68 deletions.
diff --git a/dev-tools/omdb/src/bin/omdb/db.rs b/dev-tools/omdb/src/bin/omdb/db.rs
@@ -231,7 +231,8 @@ impl DbUrlOptions {
         eprintln!("note: using database URL {}", &db_url);
 
         let db_config = db::Config { url: db_url.clone() };
-        let pool = Arc::new(db::Pool::new_qorb_single_host(&db_config));
+        let pool =
+            Arc::new(db::Pool::new_qorb_single_host(&log.clone(), &db_config));
 
         // Being a dev tool, we want to try this operation even if the schema
         // doesn't match what we expect.  So we use `DataStore::new_unchecked()`

diff --git a/nexus/db-queries/src/db/collection_attach.rs b/nexus/db-queries/src/db/collection_attach.rs
@@ -857,7 +857,7 @@ mod test {
             dev::test_setup_log("test_attach_missing_collection_fails");
         let mut db = test_setup_database(&logctx.log).await;
         let cfg = db::Config { url: db.pg_config().clone() };
-        let pool = db::Pool::new_qorb_single_host(&cfg);
+        let pool = db::Pool::new_qorb_single_host(&logctx.log, &cfg);
 
         let conn = setup_db(&pool).await;
 
@@ -886,7 +886,7 @@ mod test {
         let logctx = dev::test_setup_log("test_attach_missing_resource_fails");
         let mut db = test_setup_database(&logctx.log).await;
         let cfg = db::Config { url: db.pg_config().clone() };
-        let pool = db::Pool::new_qorb_single_host(&cfg);
+        let pool = db::Pool::new_qorb_single_host(&logctx.log, &cfg);
 
         let conn = setup_db(&pool).await;
 
@@ -923,7 +923,7 @@ mod test {
         let logctx = dev::test_setup_log("test_attach_once");
         let mut db = test_setup_database(&logctx.log).await;
         let cfg = db::Config { url: db.pg_config().clone() };
-        let pool = db::Pool::new_qorb_single_host(&cfg);
+        let pool = db::Pool::new_qorb_single_host(&logctx.log, &cfg);
 
         let conn = setup_db(&pool).await;
 
@@ -971,7 +971,7 @@ mod test {
         let logctx = dev::test_setup_log("test_attach_once_synchronous");
         let mut db = test_setup_database(&logctx.log).await;
         let cfg = db::Config { url: db.pg_config().clone() };
-        let pool = db::Pool::new_qorb_single_host(&cfg);
+        let pool = db::Pool::new_qorb_single_host(&logctx.log, &cfg);
 
         let conn = setup_db(&pool).await;
 
@@ -1020,7 +1020,7 @@ mod test {
         let logctx = dev::test_setup_log("test_attach_multiple_times");
         let mut db = test_setup_database(&logctx.log).await;
         let cfg = db::Config { url: db.pg_config().clone() };
-        let pool = db::Pool::new_qorb_single_host(&cfg);
+        let pool = db::Pool::new_qorb_single_host(&logctx.log, &cfg);
 
         let conn = setup_db(&pool).await;
 
@@ -1076,7 +1076,7 @@ mod test {
         let logctx = dev::test_setup_log("test_attach_beyond_capacity_fails");
         let mut db = test_setup_database(&logctx.log).await;
         let cfg = db::Config { url: db.pg_config().clone() };
-        let pool = db::Pool::new_qorb_single_host(&cfg);
+        let pool = db::Pool::new_qorb_single_host(&logctx.log, &cfg);
 
         let conn = setup_db(&pool).await;
 
@@ -1140,7 +1140,7 @@ mod test {
         let logctx = dev::test_setup_log("test_attach_while_already_attached");
         let mut db = test_setup_database(&logctx.log).await;
         let cfg = db::Config { url: db.pg_config().clone() };
-        let pool = db::Pool::new_qorb_single_host(&cfg);
+        let pool = db::Pool::new_qorb_single_host(&logctx.log, &cfg);
 
         let conn = setup_db(&pool).await;
 
@@ -1247,7 +1247,7 @@ mod test {
         let logctx = dev::test_setup_log("test_attach_once");
         let mut db = test_setup_database(&logctx.log).await;
         let cfg = db::Config { url: db.pg_config().clone() };
-        let pool = db::Pool::new_qorb_single_host(&cfg);
+        let pool = db::Pool::new_qorb_single_host(&logctx.log, &cfg);
 
         let conn = setup_db(&pool).await;
 
@@ -1302,7 +1302,7 @@ mod test {
         let logctx = dev::test_setup_log("test_attach_deleted_resource_fails");
         let mut db = test_setup_database(&logctx.log).await;
         let cfg = db::Config { url: db.pg_config().clone() };
-        let pool = db::Pool::new_qorb_single_host(&cfg);
+        let pool = db::Pool::new_qorb_single_host(&logctx.log, &cfg);
 
         let conn = setup_db(&pool).await;
 
@@ -1347,7 +1347,7 @@ mod test {
         let logctx = dev::test_setup_log("test_attach_without_update_filter");
         let mut db = test_setup_database(&logctx.log).await;
         let cfg = db::Config { url: db.pg_config().clone() };
-        let pool = db::Pool::new_qorb_single_host(&cfg);
+        let pool = db::Pool::new_qorb_single_host(&logctx.log, &cfg);
 
         let conn = setup_db(&pool).await;
 

diff --git a/nexus/db-queries/src/db/collection_detach.rs b/nexus/db-queries/src/db/collection_detach.rs
@@ -784,7 +784,7 @@ mod test {
             dev::test_setup_log("test_detach_missing_collection_fails");
         let mut db = test_setup_database(&logctx.log).await;
         let cfg = db::Config { url: db.pg_config().clone() };
-        let pool = db::Pool::new_qorb_single_host(&cfg);
+        let pool = db::Pool::new_qorb_single_host(&logctx.log, &cfg);
 
         let conn = setup_db(&pool).await;
 
@@ -812,7 +812,7 @@ mod test {
         let logctx = dev::test_setup_log("test_detach_missing_resource_fails");
         let mut db = test_setup_database(&logctx.log).await;
         let cfg = db::Config { url: db.pg_config().clone() };
-        let pool = db::Pool::new_qorb_single_host(&cfg);
+        let pool = db::Pool::new_qorb_single_host(&logctx.log, &cfg);
 
         let conn = setup_db(&pool).await;
 
@@ -848,7 +848,7 @@ mod test {
         let logctx = dev::test_setup_log("test_detach_once");
         let mut db = test_setup_database(&logctx.log).await;
         let cfg = db::Config { url: db.pg_config().clone() };
-        let pool = db::Pool::new_qorb_single_host(&cfg);
+        let pool = db::Pool::new_qorb_single_host(&logctx.log, &cfg);
 
         let conn = setup_db(&pool).await;
 
@@ -888,7 +888,7 @@ mod test {
         let logctx = dev::test_setup_log("test_detach_while_already_detached");
         let mut db = test_setup_database(&logctx.log).await;
         let cfg = db::Config { url: db.pg_config().clone() };
-        let pool = db::Pool::new_qorb_single_host(&cfg);
+        let pool = db::Pool::new_qorb_single_host(&logctx.log, &cfg);
 
         let conn = setup_db(&pool).await;
 
@@ -952,7 +952,7 @@ mod test {
         let logctx = dev::test_setup_log("test_detach_deleted_resource_fails");
         let mut db = test_setup_database(&logctx.log).await;
         let cfg = db::Config { url: db.pg_config().clone() };
-        let pool = db::Pool::new_qorb_single_host(&cfg);
+        let pool = db::Pool::new_qorb_single_host(&logctx.log, &cfg);
 
         let conn = setup_db(&pool).await;
 
@@ -996,7 +996,7 @@ mod test {
         let logctx = dev::test_setup_log("test_detach_without_update_filter");
         let mut db = test_setup_database(&logctx.log).await;
         let cfg = db::Config { url: db.pg_config().clone() };
-        let pool = db::Pool::new_qorb_single_host(&cfg);
+        let pool = db::Pool::new_qorb_single_host(&logctx.log, &cfg);
 
         let conn = setup_db(&pool).await;
 

diff --git a/nexus/db-queries/src/db/collection_detach_many.rs b/nexus/db-queries/src/db/collection_detach_many.rs
@@ -776,7 +776,7 @@ mod test {
             dev::test_setup_log("test_detach_missing_collection_fails");
         let mut db = test_setup_database(&logctx.log).await;
         let cfg = db::Config { url: db.pg_config().clone() };
-        let pool = db::Pool::new_qorb_single_host(&cfg);
+        let pool = db::Pool::new_qorb_single_host(&logctx.log, &cfg);
 
         let conn = setup_db(&pool).await;
 
@@ -806,7 +806,7 @@ mod test {
             dev::test_setup_log("test_detach_missing_resource_succeeds");
         let mut db = test_setup_database(&logctx.log).await;
         let cfg = db::Config { url: db.pg_config().clone() };
-        let pool = db::Pool::new_qorb_single_host(&cfg);
+        let pool = db::Pool::new_qorb_single_host(&logctx.log, &cfg);
 
         let conn = setup_db(&pool).await;
 
@@ -847,7 +847,7 @@ mod test {
         let logctx = dev::test_setup_log("test_detach_once");
         let mut db = test_setup_database(&logctx.log).await;
         let cfg = db::Config { url: db.pg_config().clone() };
-        let pool = db::Pool::new_qorb_single_host(&cfg);
+        let pool = db::Pool::new_qorb_single_host(&logctx.log, &cfg);
 
         let conn = setup_db(&pool).await;
 
@@ -890,7 +890,7 @@ mod test {
         let logctx = dev::test_setup_log("test_detach_once_synchronous");
         let mut db = test_setup_database(&logctx.log).await;
         let cfg = db::Config { url: db.pg_config().clone() };
-        let pool = db::Pool::new_qorb_single_host(&cfg);
+        let pool = db::Pool::new_qorb_single_host(&logctx.log, &cfg);
 
         let conn = setup_db(&pool).await;
 
@@ -935,7 +935,7 @@ mod test {
         let logctx = dev::test_setup_log("test_detach_while_already_detached");
         let mut db = test_setup_database(&logctx.log).await;
         let cfg = db::Config { url: db.pg_config().clone() };
-        let pool = db::Pool::new_qorb_single_host(&cfg);
+        let pool = db::Pool::new_qorb_single_host(&logctx.log, &cfg);
 
         let conn = setup_db(&pool).await;
 
@@ -991,7 +991,7 @@ mod test {
         let logctx = dev::test_setup_log("test_detach_filter_collection");
         let mut db = test_setup_database(&logctx.log).await;
         let cfg = db::Config { url: db.pg_config().clone() };
-        let pool = db::Pool::new_qorb_single_host(&cfg);
+        let pool = db::Pool::new_qorb_single_host(&logctx.log, &cfg);
 
         let conn = setup_db(&pool).await;
 
@@ -1042,7 +1042,7 @@ mod test {
         let logctx = dev::test_setup_log("test_detach_deleted_resource");
         let mut db = test_setup_database(&logctx.log).await;
         let cfg = db::Config { url: db.pg_config().clone() };
-        let pool = db::Pool::new_qorb_single_host(&cfg);
+        let pool = db::Pool::new_qorb_single_host(&logctx.log, &cfg);
 
         let conn = setup_db(&pool).await;
 
@@ -1100,7 +1100,7 @@ mod test {
         let logctx = dev::test_setup_log("test_detach_many");
         let mut db = test_setup_database(&logctx.log).await;
         let cfg = db::Config { url: db.pg_config().clone() };
-        let pool = db::Pool::new_qorb_single_host(&cfg);
+        let pool = db::Pool::new_qorb_single_host(&logctx.log, &cfg);
 
         let conn = setup_db(&pool).await;
 

diff --git a/nexus/db-queries/src/db/collection_insert.rs b/nexus/db-queries/src/db/collection_insert.rs
@@ -558,7 +558,7 @@ mod test {
         let logctx = dev::test_setup_log("test_collection_not_present");
         let mut db = test_setup_database(&logctx.log).await;
         let cfg = db::Config { url: db.pg_config().clone() };
-        let pool = db::Pool::new_qorb_single_host(&cfg);
+        let pool = db::Pool::new_qorb_single_host(&logctx.log, &cfg);
 
         let conn = setup_db(&pool).await;
 
@@ -588,7 +588,7 @@ mod test {
         let logctx = dev::test_setup_log("test_collection_present");
         let mut db = test_setup_database(&logctx.log).await;
         let cfg = db::Config { url: db.pg_config().clone() };
-        let pool = db::Pool::new_qorb_single_host(&cfg);
+        let pool = db::Pool::new_qorb_single_host(&logctx.log, &cfg);
 
         let conn = setup_db(&pool).await;
 

diff --git a/nexus/db-queries/src/db/datastore/db_metadata.rs b/nexus/db-queries/src/db/datastore/db_metadata.rs
@@ -511,7 +511,7 @@ mod test {
         let mut crdb = test_db::test_setup_database(&logctx.log).await;
 
         let cfg = db::Config { url: crdb.pg_config().clone() };
-        let pool = Arc::new(db::Pool::new_qorb_single_host(&cfg));
+        let pool = Arc::new(db::Pool::new_qorb_single_host(&logctx.log, &cfg));
         let datastore =
             Arc::new(DataStore::new(&logctx.log, pool, None).await.unwrap());
 
@@ -559,7 +559,7 @@ mod test {
         let mut crdb = test_db::test_setup_database(&logctx.log).await;
 
         let cfg = db::Config { url: crdb.pg_config().clone() };
-        let pool = Arc::new(db::Pool::new_qorb_single_host(&cfg));
+        let pool = Arc::new(db::Pool::new_qorb_single_host(&logctx.log, &cfg));
         let conn = pool.claim().await.unwrap();
 
         // Mimic the layout of "schema/crdb".
@@ -671,7 +671,7 @@ mod test {
         let mut crdb = test_db::test_setup_database(&logctx.log).await;
 
         let cfg = db::Config { url: crdb.pg_config().clone() };
-        let pool = Arc::new(db::Pool::new_qorb_single_host(&cfg));
+        let pool = Arc::new(db::Pool::new_qorb_single_host(&logctx.log, &cfg));
         let conn = pool.claim().await.unwrap();
 
         // Mimic the layout of "schema/crdb".

diff --git a/nexus/db-queries/src/db/datastore/mod.rs b/nexus/db-queries/src/db/datastore/mod.rs
@@ -1573,7 +1573,7 @@ mod test {
             dev::test_setup_log("test_queries_do_not_require_full_table_scan");
         let mut db = test_setup_database(&logctx.log).await;
         let cfg = db::Config { url: db.pg_config().clone() };
-        let pool = db::Pool::new_qorb_single_host(&cfg);
+        let pool = db::Pool::new_qorb_single_host(&logctx.log, &cfg);
         let datastore =
             DataStore::new(&logctx.log, Arc::new(pool), None).await.unwrap();
         let conn = datastore.pool_connection_for_tests().await.unwrap();
@@ -1622,7 +1622,7 @@ mod test {
         let logctx = dev::test_setup_log("test_sled_ipv6_address_allocation");
         let mut db = test_setup_database(&logctx.log).await;
         let cfg = db::Config { url: db.pg_config().clone() };
-        let pool = Arc::new(db::Pool::new_qorb_single_host(&cfg));
+        let pool = Arc::new(db::Pool::new_qorb_single_host(&logctx.log, &cfg));
         let datastore =
             Arc::new(DataStore::new(&logctx.log, pool, None).await.unwrap());
         let opctx = OpContext::for_tests(

diff --git a/nexus/db-queries/src/db/datastore/pub_test_utils.rs b/nexus/db-queries/src/db/datastore/pub_test_utils.rs
@@ -29,7 +29,7 @@ pub async fn datastore_test(
     use crate::authn;
 
     let cfg = db::Config { url: db.pg_config().clone() };
-    let pool = Arc::new(db::Pool::new_qorb_single_host(&cfg));
+    let pool = Arc::new(db::Pool::new_qorb_single_host(&logctx.log, &cfg));
     let datastore =
         Arc::new(DataStore::new(&logctx.log, pool, None).await.unwrap());
 

diff --git a/nexus/db-queries/src/db/explain.rs b/nexus/db-queries/src/db/explain.rs
@@ -144,7 +144,7 @@ mod test {
         let logctx = dev::test_setup_log("test_explain_async");
         let mut db = test_setup_database(&logctx.log).await;
         let cfg = db::Config { url: db.pg_config().clone() };
-        let pool = db::Pool::new_qorb_single_host(&cfg);
+        let pool = db::Pool::new_qorb_single_host(&logctx.log, &cfg);
         let conn = pool.claim().await.unwrap();
 
         create_schema(&pool).await;
@@ -169,7 +169,7 @@ mod test {
         let logctx = dev::test_setup_log("test_explain_full_table_scan");
         let mut db = test_setup_database(&logctx.log).await;
         let cfg = db::Config { url: db.pg_config().clone() };
-        let pool = db::Pool::new_qorb_single_host(&cfg);
+        let pool = db::Pool::new_qorb_single_host(&logctx.log, &cfg);
         let conn = pool.claim().await.unwrap();
 
         create_schema(&pool).await;

diff --git a/nexus/db-queries/src/db/pagination.rs b/nexus/db-queries/src/db/pagination.rs
@@ -402,7 +402,7 @@ mod test {
             dev::test_setup_log("test_paginated_single_column_ascending");
         let mut db = test_setup_database(&logctx.log).await;
         let cfg = db::Config { url: db.pg_config().clone() };
-        let pool = db::Pool::new_qorb_single_host(&cfg);
+        let pool = db::Pool::new_qorb_single_host(&logctx.log, &cfg);
 
         use schema::test_users::dsl;
 
@@ -437,7 +437,7 @@ mod test {
             dev::test_setup_log("test_paginated_single_column_descending");
         let mut db = test_setup_database(&logctx.log).await;
         let cfg = db::Config { url: db.pg_config().clone() };
-        let pool = db::Pool::new_qorb_single_host(&cfg);
+        let pool = db::Pool::new_qorb_single_host(&logctx.log, &cfg);
 
         use schema::test_users::dsl;
 
@@ -472,7 +472,7 @@ mod test {
             dev::test_setup_log("test_paginated_multicolumn_ascending");
         let mut db = test_setup_database(&logctx.log).await;
         let cfg = db::Config { url: db.pg_config().clone() };
-        let pool = db::Pool::new_qorb_single_host(&cfg);
+        let pool = db::Pool::new_qorb_single_host(&logctx.log, &cfg);
 
         use schema::test_users::dsl;
 
@@ -526,7 +526,7 @@ mod test {
             dev::test_setup_log("test_paginated_multicolumn_descending");
         let mut db = test_setup_database(&logctx.log).await;
         let cfg = db::Config { url: db.pg_config().clone() };
-        let pool = db::Pool::new_qorb_single_host(&cfg);
+        let pool = db::Pool::new_qorb_single_host(&logctx.log, &cfg);
 
         use schema::test_users::dsl;