Skip to content

Commit faa0b5d

Browse files
committed
non-fatal step, executioncomponent order
1 parent 23a3335 commit faa0b5d

File tree

2 files changed

+11
-7
lines changed
  • nexus
    • reconfigurator/execution/src
    • types/src/deployment/execution

2 files changed

+11
-7
lines changed

nexus/reconfigurator/execution/src/lib.rs

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -409,13 +409,17 @@ fn register_deploy_db_metadata_nexus_records_step<'a>(
409409
.new_step(
410410
ExecutionStepId::Ensure,
411411
"Ensure db_metadata_nexus_state records exist",
412-
async move |_cx| {
413-
database::deploy_db_metadata_nexus_records(
414-
opctx, &datastore, &blueprint,
412+
async move |_cx| match database::deploy_db_metadata_nexus_records(
413+
opctx, &datastore, &blueprint,
414+
)
415+
.await
416+
{
417+
Ok(()) => StepSuccess::new(()).into(),
418+
Err(err) => StepWarning::new(
419+
(),
420+
err.context("ensuring db_metadata_nexus_state").to_string(),
415421
)
416-
.await
417-
.context("ensuring db_metadata_nexus_state")?;
418-
StepSuccess::new(()).into()
422+
.into(),
419423
},
420424
)
421425
.register();

nexus/types/src/deployment/execution/spec.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ pub enum ExecutionComponent {
3030
ExternalNetworking,
3131
SupportBundles,
3232
SledList,
33-
SledAgent,
3433
DeployNexusRecords,
34+
SledAgent,
3535
PhysicalDisks,
3636
OmicronZones,
3737
FirewallRules,

0 commit comments

Comments
 (0)