From b1339d40e6a1ee352017116b25c6c6361276bd7c Mon Sep 17 00:00:00 2001 From: Sean Klein Date: Mon, 24 Jun 2024 15:48:13 -0700 Subject: [PATCH] Cleanup --- dev-tools/reconfigurator-cli/tests/test_basic.rs | 2 +- nexus/db-queries/src/db/datastore/deployment.rs | 2 +- nexus/reconfigurator/execution/src/dns.rs | 2 -- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dev-tools/reconfigurator-cli/tests/test_basic.rs b/dev-tools/reconfigurator-cli/tests/test_basic.rs index df8cf20b44..efba4ee4f4 100644 --- a/dev-tools/reconfigurator-cli/tests/test_basic.rs +++ b/dev-tools/reconfigurator-cli/tests/test_basic.rs @@ -175,7 +175,7 @@ async fn test_blueprint_edit(cptestctx: &ControlPlaneTestContext) { // Load the new file and find the new blueprint name. let state2: UnstableReconfiguratorState = read_json(&saved_state2_path).unwrap(); - assert_eq!(state2.blueprints.len(), state1.blueprints.len() + 1); // XXX + assert_eq!(state2.blueprints.len(), state1.blueprints.len() + 1); let new_blueprint = state2.blueprints.into_iter().rev().next().unwrap(); assert_ne!(new_blueprint.id, blueprint.id); diff --git a/nexus/db-queries/src/db/datastore/deployment.rs b/nexus/db-queries/src/db/datastore/deployment.rs index 002df305ae..617413f172 100644 --- a/nexus/db-queries/src/db/datastore/deployment.rs +++ b/nexus/db-queries/src/db/datastore/deployment.rs @@ -504,7 +504,7 @@ impl DataStore { ) .filter(dsl::blueprint_id.eq(blueprint_id)) .select(BpOmicronZone::as_select()) - .load_async::(&*conn) + .load_async(&*conn) .await .map_err(|e| { public_error_from_diesel(e, ErrorHandler::Server) diff --git a/nexus/reconfigurator/execution/src/dns.rs b/nexus/reconfigurator/execution/src/dns.rs index b1fe239b41..2dbb3eff5c 100644 --- a/nexus/reconfigurator/execution/src/dns.rs +++ b/nexus/reconfigurator/execution/src/dns.rs @@ -1242,8 +1242,6 @@ mod test { .await .unwrap() }; - info!(log, "Sled rows"; "rows" => ?sled_rows); - info!(log, "Zpool rows"; "rows" => ?zpool_rows); let planning_input = { let mut builder = PlanningInputFromDb { sled_rows: &sled_rows,