omdb support for planning reports

Author: plotnick

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

@@ -1258,11 +1258,12 @@ fn print_task_blueprint_planner(details: &serde_json::Value) {
                      but could not make it the target: {error}"
             );
         }
-        BlueprintPlannerStatus::Targeted { blueprint_id, .. } => {
+        BlueprintPlannerStatus::Targeted { blueprint_id, report, .. } => {
             println!(
                 "    planned new blueprint {blueprint_id}, \
                      and made it the current target"
             );
+            println!("{report}");
         }
     }
 }

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

@@ -150,7 +150,7 @@ impl BlueprintPlanner {
                 ));
             }
         };
-        let blueprint = match planner.plan() {
+        let (blueprint, report) = match planner.plan_and_report() {
             Ok(blueprint) => blueprint,
             Err(error) => {
                 error!(&opctx.log, "can't plan: {error}");
@@ -241,7 +241,11 @@ impl BlueprintPlanner {
 
         // 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,
+            report,
+        }
     }
 }
 
@@ -332,8 +336,10 @@ mod test {
             BlueprintPlannerStatus::Targeted {
                 parent_blueprint_id,
                 blueprint_id,
+                report,
             } if parent_blueprint_id == initial_blueprint.id
-                && blueprint_id != initial_blueprint.id =>
+                && blueprint_id != initial_blueprint.id
+                && blueprint_id == report.blueprint_id =>
             {
                 blueprint_id
             }

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::PlanningReport;
 use crate::external_api::views;
 use chrono::DateTime;
 use chrono::Utc;
@@ -460,6 +461,7 @@ impl slog::KV for DebugDatasetsRendezvousStats {
 }
 
 /// The status of a `blueprint_planner` background task activation.
+#[allow(clippy::large_enum_variant)]
 #[derive(Clone, Debug, Deserialize, Serialize, PartialEq, Eq)]
 pub enum BlueprintPlannerStatus {
     /// Automatic blueprint planning has been explicitly disabled
@@ -479,7 +481,11 @@ pub enum BlueprintPlannerStatus {
 
     /// 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,
+        report: PlanningReport,
+    },
 }
 
 /// The status of a `alert_dispatcher` background task activation.