Report wait conditions in blueprint planner status

Author: plotnick

dev-tools/omdb/src/bin/omdb/nexus.rs

@@ -45,6 +45,7 @@ use nexus_types::deployment::ClickhouseMode;
 use nexus_types::deployment::ClickhousePolicy;
 use nexus_types::deployment::OximeterReadMode;
 use nexus_types::deployment::OximeterReadPolicy;
+use nexus_types::deployment::WaitCondition;
 use nexus_types::internal_api::background::AbandonedVmmReaperStatus;
 use nexus_types::internal_api::background::BlueprintPlannerStatus;
 use nexus_types::internal_api::background::BlueprintRendezvousStatus;
@@ -1218,6 +1219,13 @@ fn print_task_abandoned_vmm_reaper(details: &serde_json::Value) {
 }
 
 fn print_task_blueprint_planner(details: &serde_json::Value) {
+    fn print_waiting_on(waiting_on: &[WaitCondition]) {
+        let n = waiting_on.len();
+        if n > 0 {
+            println!("    waiting on {n} events: {waiting_on:?}");
+        }
+    }
+
     let status =
         match serde_json::from_value::<BlueprintPlannerStatus>(details.clone())
         {
@@ -1237,20 +1245,32 @@ fn print_task_blueprint_planner(details: &serde_json::Value) {
         BlueprintPlannerStatus::Error(error) => {
             println!("    task did not complete successfully: {error}");
         }
-        BlueprintPlannerStatus::Unchanged { parent_blueprint_id } => {
+        BlueprintPlannerStatus::Unchanged {
+            parent_blueprint_id,
+            waiting_on,
+        } => {
             println!("    plan unchanged from parent {parent_blueprint_id}");
+            print_waiting_on(&waiting_on);
         }
-        BlueprintPlannerStatus::Planned { parent_blueprint_id, error } => {
+        BlueprintPlannerStatus::Planned {
+            parent_blueprint_id,
+            error,
+            waiting_on,
+        } => {
             println!(
                 "    planned new blueprint from parent {parent_blueprint_id}, \
                      but could not make it the target: {error}"
             );
+            print_waiting_on(&waiting_on);
         }
-        BlueprintPlannerStatus::Targeted { blueprint_id, .. } => {
+        BlueprintPlannerStatus::Targeted {
+            blueprint_id, waiting_on, ..
+        } => {
             println!(
                 "    planned new blueprint {blueprint_id}, \
                      and made it the current target"
             );
+            print_waiting_on(&waiting_on);
         }
     }
 }

nexus/reconfigurator/planning/src/planner.rs

@@ -184,6 +184,13 @@ impl<'a> Planner<'a> {
         Ok(self.blueprint.build())
     }
 
+    pub fn plan_and_wait_conditions(
+        mut self,
+    ) -> Result<(Blueprint, Vec<WaitCondition>), Error> {
+        let conditions = self.waiting_on.drain(..).collect();
+        Ok((self.plan()?, conditions))
+    }
+
     fn check_input_validity(&self) -> Result<(), Error> {
         if self.input.target_internal_dns_zone_count() > INTERNAL_DNS_REDUNDANCY
         {

nexus/src/app/background/tasks/blueprint_planner.rs

@@ -142,7 +142,7 @@ impl BlueprintPlanner {
                 ));
             }
         };
-        let blueprint = match planner.plan() {
+        let (blueprint, waiting_on) = match planner.plan_and_wait_conditions() {
             Ok(blueprint) => blueprint,
             Err(error) => {
                 error!(&opctx.log, "can't plan: {error}");
@@ -161,7 +161,10 @@ impl BlueprintPlanner {
                 "blueprint unchanged from current target";
                 "parent_blueprint_id" => %parent_blueprint_id,
             );
-            return BlueprintPlannerStatus::Unchanged { parent_blueprint_id };
+            return BlueprintPlannerStatus::Unchanged {
+                parent_blueprint_id,
+                waiting_on,
+            };
         }
 
         // We have a fresh blueprint; save it.
@@ -227,13 +230,18 @@ impl BlueprintPlanner {
                 return BlueprintPlannerStatus::Planned {
                     parent_blueprint_id,
                     error: format!("{error}"),
+                    waiting_on,
                 };
             }
         }
 
         // We have a new target!
         self.tx_blueprint.send_replace(Some(Arc::new((target, blueprint))));
-        BlueprintPlannerStatus::Targeted { parent_blueprint_id, blueprint_id }
+        BlueprintPlannerStatus::Targeted {
+            parent_blueprint_id,
+            blueprint_id,
+            waiting_on,
+        }
     }
 }
 
@@ -314,6 +322,7 @@ mod test {
             BlueprintPlannerStatus::Targeted {
                 parent_blueprint_id,
                 blueprint_id,
+                waiting_on: _,
             } if parent_blueprint_id == initial_blueprint.id
                 && blueprint_id != initial_blueprint.id =>
             {
@@ -343,6 +352,7 @@ mod test {
             status,
             BlueprintPlannerStatus::Unchanged {
                 parent_blueprint_id: blueprint_id,
+                waiting_on: vec![],
             }
         );
 
@@ -405,6 +415,7 @@ mod test {
             status,
             BlueprintPlannerStatus::Unchanged {
                 parent_blueprint_id: blueprint_id,
+                waiting_on: vec![],
             }
         );
     }

nexus/types/src/internal_api/background.rs

@@ -2,6 +2,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
+use crate::deployment::WaitCondition;
 use crate::external_api::views;
 use chrono::DateTime;
 use chrono::Utc;
@@ -471,15 +472,26 @@ pub enum BlueprintPlannerStatus {
 
     /// Planning produced a blueprint identital to the current target,
     /// so we threw it away and did nothing.
-    Unchanged { parent_blueprint_id: BlueprintUuid },
+    Unchanged {
+        parent_blueprint_id: BlueprintUuid,
+        waiting_on: Vec<WaitCondition>,
+    },
 
     /// Planning produced a new blueprint, but we failed to make it
     /// the current target and so deleted it.
-    Planned { parent_blueprint_id: BlueprintUuid, error: String },
+    Planned {
+        parent_blueprint_id: BlueprintUuid,
+        error: String,
+        waiting_on: Vec<WaitCondition>,
+    },
 
     /// Planing succeeded, and we saved and made the new blueprint the
     /// current target.
-    Targeted { parent_blueprint_id: BlueprintUuid, blueprint_id: BlueprintUuid },
+    Targeted {
+        parent_blueprint_id: BlueprintUuid,
+        blueprint_id: BlueprintUuid,
+        waiting_on: Vec<WaitCondition>,
+    },
 }
 
 /// The status of a `alert_dispatcher` background task activation.