[planner] Identify when zone update is blocked on inventory (#9063)

Fixes #9047

---------

Co-authored-by: Alex Plotnick <[email protected]>

Author: smklein

dev-tools/reconfigurator-cli/tests/output/cmds-mupdate-update-flow-stdout

@@ -2186,6 +2186,7 @@ planning report:
 * noop converting host phase 2 slot B to Artifact on sled 98e6b7c2-2efa-41ca-b20a-0a4d61102fe6
 * noop converting host phase 2 slot B to Artifact on sled d81c6a84-79b8-4958-ae41-ea46c9b19763
 * only placed 0/1 desired nexus zones
+* zone updates waiting on zone propagation to inventory
 * waiting to update top-level nexus_generation: some non-Nexus zone are not yet updated
 
 

dev-tools/reconfigurator-cli/tests/output/cmds-target-release-stdout

@@ -3237,6 +3237,7 @@ planning report:
 * waiting for NTP zones to appear in inventory on sleds: 2b8f0cb3-0295-4b3c-bc58-4fe88b57112c
 * sleds getting NTP zones and which have other services already, making them eligible for discretionary zones: 2b8f0cb3-0295-4b3c-bc58-4fe88b57112c
 * missing NTP zone on sled 2b8f0cb3-0295-4b3c-bc58-4fe88b57112c
+* zone updates waiting on zone propagation to inventory
 * waiting to update top-level nexus_generation: some non-Nexus zone are not yet updated
 
 
@@ -5327,6 +5328,7 @@ planning report:
 * waiting for NTP zones to appear in inventory on sleds: 98e6b7c2-2efa-41ca-b20a-0a4d61102fe6
 * sleds getting NTP zones and which have other services already, making them eligible for discretionary zones: 98e6b7c2-2efa-41ca-b20a-0a4d61102fe6
 * missing NTP zone on sled 98e6b7c2-2efa-41ca-b20a-0a4d61102fe6
+* zone updates waiting on zone propagation to inventory
 * waiting to update top-level nexus_generation: some non-Nexus zone are not yet updated
 
 
@@ -7092,6 +7094,7 @@ planning report:
 * waiting for NTP zones to appear in inventory on sleds: d81c6a84-79b8-4958-ae41-ea46c9b19763
 * sleds getting NTP zones and which have other services already, making them eligible for discretionary zones: d81c6a84-79b8-4958-ae41-ea46c9b19763
 * missing NTP zone on sled d81c6a84-79b8-4958-ae41-ea46c9b19763
+* zone updates waiting on zone propagation to inventory
 * waiting to update top-level nexus_generation: some non-Nexus zone are not yet updated
 
 

nexus/reconfigurator/planning/src/planner.rs

@@ -1545,18 +1545,20 @@ impl<'a> Planner<'a> {
         &mut self,
         mgs_updates: &PlanningMgsUpdatesStepReport,
     ) -> Result<PlanningZoneUpdatesStepReport, Error> {
-        let mut report = PlanningZoneUpdatesStepReport::new();
-
         let zones_currently_updating =
             self.get_zones_not_yet_propagated_to_inventory();
         if !zones_currently_updating.is_empty() {
             info!(
                 self.log, "some zones not yet up-to-date";
                 "zones_currently_updating" => ?zones_currently_updating,
             );
-            return Ok(report);
+            return Ok(PlanningZoneUpdatesStepReport::waiting_on(
+                ZoneUpdatesWaitingOn::InventoryPropagation,
+            ));
         }
 
+        let mut report = PlanningZoneUpdatesStepReport::new();
+
         // Find the zones with out-of-date images
         let out_of_date_zones = self.get_out_of_date_zones();
         for (sled_id, zone, desired_image) in out_of_date_zones.iter() {

nexus/types/src/deployment/planning_report.rs

@@ -1023,6 +1023,9 @@ pub enum ZoneUpdatesWaitingOn {
     /// Waiting on discretionary zone placement.
     DiscretionaryZones,
 
+    /// Waiting on zones to propagate to inventory.
+    InventoryPropagation,
+
     /// Waiting on updates to RoT / SP / Host OS / etc.
     PendingMgsUpdates,
 
@@ -1034,6 +1037,7 @@ impl ZoneUpdatesWaitingOn {
     pub fn as_str(&self) -> &'static str {
         match self {
             Self::DiscretionaryZones => "discretionary zones",
+            Self::InventoryPropagation => "zone propagation to inventory",
             Self::PendingMgsUpdates => {
                 "pending MGS updates (RoT / SP / Host OS / etc.)"
             }

openapi/nexus-internal.json

@@ -6013,6 +6013,21 @@
               "type"
             ]
           },
+          {
+            "description": "Waiting on zones to propagate to inventory.",
+            "type": "object",
+            "properties": {
+              "type": {
+                "type": "string",
+                "enum": [
+                  "inventory_propagation"
+                ]
+              }
+            },
+            "required": [
+              "type"
+            ]
+          },
           {
             "description": "Waiting on updates to RoT / SP / Host OS / etc.",
             "type": "object",