minor fixes

Author: labbott

nexus/db-model/src/deployment.rs

@@ -1220,7 +1220,6 @@ impl TryFrom<DbBpZoneImageSourceColumns> for BlueprintZoneImageSource {
 
 #[derive(Queryable, Clone, Debug, Selectable, Insertable)]
 #[diesel(table_name = bp_single_measurements)]
-//#[diesel(check_for_backend(diesel::pg::Pg))]
 pub struct BpSingleMeasurement {
     pub blueprint_id: DbTypedUuid<BlueprintKind>,
     pub sled_id: DbTypedUuid<SledKind>,

nexus/reconfigurator/planning/src/blueprint_builder/builder.rs

@@ -2294,6 +2294,7 @@ impl EnsureMupdateOverrideAction {
                 let zones_desc = zones_desc(zones);
                 let host_phase_2_desc =
                     host_phase_2_to_current_contents_desc(prev_host_phase_2);
+
                 info!(
                     log,
                     "blueprint mupdate override updated to match inventory";

nexus/types/src/deployment.rs

@@ -1619,9 +1619,8 @@ pub enum BlueprintMeasurementSetDesiredContents {
     /// MUPdate. The image used here can vary by sled and even over time (if the
     /// sled gets MUPdated again).
     ///
-    /// Historically, this was the only source for zone images. In an system
-    /// with automated control-plane-driven update we expect to only use this
-    /// variant in emergencies where the system had to be recovered via MUPdate.
+    /// We expect this to only be used for first install and in emergency
+    /// MUPdate recovery.
     InstallDataset,
 
     /// This measurement  source is the artifact matching this hash from the TUF

sled-agent/types/versions/src/impls/inventory.rs

@@ -23,11 +23,10 @@ use crate::latest::inventory::{
     HostPhase2DesiredContents, HostPhase2DesiredSlots, ManifestBootInventory,
     ManifestInventory, ManifestNonBootInventory, MupdateOverrideBootInventory,
     MupdateOverrideInventory, MupdateOverrideNonBootInventory,
-    OmicronSledConfig, OmicronZoneConfig, OmicronZoneImageSource,
-    OmicronZoneType, OmicronZonesConfig,
+    OmicronMeasurements, OmicronSledConfig, OmicronZoneConfig,
+    OmicronZoneImageSource, OmicronZoneType, OmicronZonesConfig,
     RemoveMupdateOverrideBootSuccessInventory, RemoveMupdateOverrideInventory,
     ZoneArtifactInventory, ZoneImageResolverInventory, ZoneKind,
-    OmicronMeasurements,
 };
 
 impl ZoneKind {
@@ -591,8 +590,11 @@ pub struct ZoneImageResolverInventoryDisplay<'a> {
 
 impl fmt::Display for ZoneImageResolverInventoryDisplay<'_> {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        let ZoneImageResolverInventory { zone_manifest, measurement_manifest, mupdate_override } =
-            self.inner;
+        let ZoneImageResolverInventory {
+            zone_manifest,
+            measurement_manifest,
+            mupdate_override,
+        } = self.inner;
         writeln!(f, "zone manifest:")?;
         let mut indented = IndentWriter::new("    ", f);
         write!(indented, "{}", zone_manifest.display())?;

sled-agent/types/versions/src/initial/inventory.rs

@@ -276,6 +276,7 @@ pub struct ZoneImageResolverInventory {
     /// The zone manifest status.
     pub zone_manifest: ManifestInventory,
 
+    /// The mupdate override status.
     pub mupdate_override: MupdateOverrideInventory,
 }
 

sled-agent/types/versions/src/latest.rs

@@ -124,7 +124,7 @@ pub mod inventory {
     pub use crate::impls::inventory::MupdateOverrideInventoryDisplay;
     pub use crate::impls::inventory::MupdateOverrideNonBootInventoryDisplay;
     pub use crate::impls::inventory::ZoneArtifactInventoryDisplay;
-    pub use crate::impls::inventory::ZoneImageResolverInventoryDisplay;    
+    pub use crate::impls::inventory::ZoneImageResolverInventoryDisplay;
 }
 
 pub mod probes {

sled-agent/types/versions/src/measurements/inventory.rs

@@ -27,8 +27,7 @@ use crate::v1::inventory::{
     BootPartitionContents, ConfigReconcilerInventoryResult,
     HostPhase2DesiredSlots, InventoryDataset, InventoryDisk, InventoryZpool,
     ManifestInventory, MupdateOverrideInventory, OrphanedDataset,
-    RemoveMupdateOverrideInventory,
-    SledRole,
+    RemoveMupdateOverrideInventory, SledRole,
 };
 use crate::v10;
 use crate::v11;