Skip to content

Commit b252a24

Browse files
davepachecodavepacheco
authored
rustfmt bails out in blueprint_insert_on_connection() (#8394)
1 parent 6ac8e1d commit b252a24

File tree

1 file changed

+110
-71
lines changed

1 file changed

+110
-71
lines changed

‎nexus/db-queries/src/db/datastore/deployment.rs

Lines changed: 110 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -320,101 +320,140 @@ impl DataStore {
320320
#[allow(clippy::disallowed_methods)]
321321
self.transaction_non_retry_wrapper("blueprint_insert")
322322
.transaction(&conn, |conn| async move {
323-
// Insert the row for the blueprint.
324-
{
325-
use nexus_db_schema::schema::blueprint::dsl;
326-
let _: usize = diesel::insert_into(dsl::blueprint)
327-
.values(row_blueprint)
328-
.execute_async(&conn)
329-
.await?;
330-
}
331-
332-
// Insert all the sled states for this blueprint.
333-
{
334-
use nexus_db_schema::schema::bp_sled_metadata::dsl as sled_metadata;
323+
// Insert the row for the blueprint.
324+
{
325+
use nexus_db_schema::schema::blueprint::dsl;
326+
let _: usize = diesel::insert_into(dsl::blueprint)
327+
.values(row_blueprint)
328+
.execute_async(&conn)
329+
.await?;
330+
}
335331

336-
let _ = diesel::insert_into(sled_metadata::bp_sled_metadata)
337-
.values(sled_metadatas)
338-
.execute_async(&conn)
339-
.await?;
340-
}
332+
// Insert all the sled states for this blueprint.
333+
{
334+
// Skip formatting this line to prevent rustfmt bailing out.
335+
#[rustfmt::skip]
336+
use nexus_db_schema::schema::bp_sled_metadata::dsl
337+
as sled_metadata;
338+
339+
let _ =
340+
diesel::insert_into(sled_metadata::bp_sled_metadata)
341+
.values(sled_metadatas)
342+
.execute_async(&conn)
343+
.await?;
344+
}
341345

342-
// Insert all physical disks for this blueprint.
343-
{
344-
use nexus_db_schema::schema::bp_omicron_physical_disk::dsl as omicron_disk;
345-
let _ = diesel::insert_into(omicron_disk::bp_omicron_physical_disk)
346+
// Insert all physical disks for this blueprint.
347+
{
348+
// Skip formatting this line to prevent rustfmt bailing out.
349+
#[rustfmt::skip]
350+
use nexus_db_schema::schema::bp_omicron_physical_disk::dsl
351+
as omicron_disk;
352+
let _ = diesel::insert_into(
353+
omicron_disk::bp_omicron_physical_disk,
354+
)
346355
.values(omicron_physical_disks)
347356
.execute_async(&conn)
348357
.await?;
349-
}
358+
}
350359

351-
// Insert all datasets for this blueprint.
352-
{
353-
use nexus_db_schema::schema::bp_omicron_dataset::dsl as omicron_dataset;
354-
let _ = diesel::insert_into(omicron_dataset::bp_omicron_dataset)
360+
// Insert all datasets for this blueprint.
361+
{
362+
// Skip formatting this line to prevent rustfmt bailing out.
363+
#[rustfmt::skip]
364+
use nexus_db_schema::schema::bp_omicron_dataset::dsl
365+
as omicron_dataset;
366+
let _ = diesel::insert_into(
367+
omicron_dataset::bp_omicron_dataset,
368+
)
355369
.values(omicron_datasets)
356370
.execute_async(&conn)
357371
.await?;
358-
}
359-
360-
// Insert all the Omicron zones for this blueprint.
361-
{
362-
use nexus_db_schema::schema::bp_omicron_zone::dsl as omicron_zone;
363-
let _ = diesel::insert_into(omicron_zone::bp_omicron_zone)
364-
.values(omicron_zones)
365-
.execute_async(&conn)
366-
.await?;
367-
}
372+
}
368373

369-
{
370-
use nexus_db_schema::schema::bp_omicron_zone_nic::dsl as omicron_zone_nic;
371-
let _ =
372-
diesel::insert_into(omicron_zone_nic::bp_omicron_zone_nic)
373-
.values(omicron_zone_nics)
374+
// Insert all the Omicron zones for this blueprint.
375+
{
376+
// Skip formatting this line to prevent rustfmt bailing out.
377+
#[rustfmt::skip]
378+
use nexus_db_schema::schema::bp_omicron_zone::dsl
379+
as omicron_zone;
380+
let _ = diesel::insert_into(omicron_zone::bp_omicron_zone)
381+
.values(omicron_zones)
374382
.execute_async(&conn)
375383
.await?;
376-
}
377-
378-
// Insert all clickhouse cluster related tables if necessary
379-
if let Some((clickhouse_cluster_config, keepers, servers)) = clickhouse_tables {
380-
{
381-
use nexus_db_schema::schema::bp_clickhouse_cluster_config::dsl;
382-
let _ = diesel::insert_into(dsl::bp_clickhouse_cluster_config)
383-
.values(clickhouse_cluster_config)
384-
.execute_async(&conn)
385-
.await?;
386384
}
385+
387386
{
388-
use nexus_db_schema::schema::bp_clickhouse_keeper_zone_id_to_node_id::dsl;
389-
let _ = diesel::insert_into(dsl::bp_clickhouse_keeper_zone_id_to_node_id)
390-
.values(keepers)
387+
// Skip formatting this line to prevent rustfmt bailing out.
388+
#[rustfmt::skip]
389+
use nexus_db_schema::schema::bp_omicron_zone_nic::dsl
390+
as omicron_zone_nic;
391+
let _ = diesel::insert_into(
392+
omicron_zone_nic::bp_omicron_zone_nic,
393+
)
394+
.values(omicron_zone_nics)
391395
.execute_async(&conn)
392396
.await?;
393397
}
398+
399+
// Insert all clickhouse cluster related tables if necessary
400+
if let Some((clickhouse_cluster_config, keepers, servers)) =
401+
clickhouse_tables
394402
{
395-
use nexus_db_schema::schema::bp_clickhouse_server_zone_id_to_node_id::dsl;
396-
let _ = diesel::insert_into(dsl::bp_clickhouse_server_zone_id_to_node_id)
397-
.values(servers)
398-
.execute_async(&conn)
399-
.await?;
403+
{
404+
// Skip formatting this line to prevent rustfmt bailing
405+
// out.
406+
#[rustfmt::skip]
407+
use nexus_db_schema::schema::
408+
bp_clickhouse_cluster_config::dsl;
409+
let _ = diesel::insert_into(
410+
dsl::bp_clickhouse_cluster_config,
411+
)
412+
.values(clickhouse_cluster_config)
413+
.execute_async(&conn)
414+
.await?;
415+
}
416+
{
417+
// Skip formatting this line to prevent rustfmt bailing
418+
// out.
419+
#[rustfmt::skip]
420+
use nexus_db_schema::schema::
421+
bp_clickhouse_keeper_zone_id_to_node_id::dsl;
422+
let _ = diesel::insert_into(
423+
dsl::bp_clickhouse_keeper_zone_id_to_node_id,
424+
)
425+
.values(keepers)
426+
.execute_async(&conn)
427+
.await?;
428+
}
429+
{
430+
// Skip formatting this line to prevent rustfmt bailing
431+
// out.
432+
#[rustfmt::skip]
433+
use nexus_db_schema::schema::
434+
bp_clickhouse_server_zone_id_to_node_id::dsl;
435+
let _ = diesel::insert_into(
436+
dsl::bp_clickhouse_server_zone_id_to_node_id,
437+
)
438+
.values(servers)
439+
.execute_async(&conn)
440+
.await?;
441+
}
400442
}
401-
}
402443

403-
// Insert oximeter read policy for this blueprint
404-
{
405-
use nexus_db_schema::schema::bp_oximeter_read_policy::dsl;
406-
let _ =
407-
diesel::insert_into(dsl::bp_oximeter_read_policy)
444+
// Insert oximeter read policy for this blueprint
445+
{
446+
use nexus_db_schema::schema::bp_oximeter_read_policy::dsl;
447+
let _ = diesel::insert_into(dsl::bp_oximeter_read_policy)
408448
.values(oximeter_read_policy)
409449
.execute_async(&conn)
410450
.await?;
411-
}
412-
413-
Ok(())
451+
}
414452

415-
})
416-
.await
417-
.map_err(|e| public_error_from_diesel(e, ErrorHandler::Server))?;
453+
Ok(())
454+
})
455+
.await
456+
.map_err(|e| public_error_from_diesel(e, ErrorHandler::Server))?;
418457

419458
info!(
420459
&opctx.log,

0 commit comments

Comments
 (0)