Local storage [1/4]: add local_storage dataset

common/src/api/internal/shared.rs

@@ -943,6 +943,9 @@ pub enum DatasetKind {
 
     // Other datasets
     Debug,
+
+    /// Used for transient storage, contains volumes delegated to VMMs
+    LocalStorage,
 }
 
 impl Serialize for DatasetKind {
@@ -1003,7 +1006,10 @@ impl DatasetKind {
         match self {
             Cockroach | Crucible | Clickhouse | ClickhouseKeeper
             | ClickhouseServer | ExternalDns | InternalDns => true,
+
             TransientZoneRoot | TransientZone { .. } | Debug => false,
+
+            LocalStorage => true,
         }
     }
 
@@ -1041,6 +1047,7 @@ impl fmt::Display for DatasetKind {
                 return Ok(());
             }
             Debug => "debug",
+            LocalStorage => "local_storage",
         };
         write!(f, "{}", s)
     }
@@ -1067,6 +1074,7 @@ impl FromStr for DatasetKind {
             "internal_dns" => InternalDns,
             "zone" => TransientZoneRoot,
             "debug" => Debug,
+            "local_storage" => LocalStorage,
             other => {
                 if let Some(name) = other.strip_prefix("zone/") {
                     TransientZone { name: name.to_string() }
@@ -1162,6 +1170,7 @@ mod tests {
             DatasetKind::TransientZoneRoot,
             DatasetKind::TransientZone { name: String::from("myzone") },
             DatasetKind::Debug,
+            DatasetKind::LocalStorage,
         ];
 
         assert_eq!(kinds.len(), DatasetKind::COUNT);

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

@@ -53,6 +53,7 @@ use nexus_types::deployment::OximeterReadPolicy;
 use nexus_types::internal_api::background::AbandonedVmmReaperStatus;
 use nexus_types::internal_api::background::BlueprintPlannerStatus;
 use nexus_types::internal_api::background::BlueprintRendezvousStatus;
+use nexus_types::internal_api::background::DatasetsRendezvousStats;
 use nexus_types::internal_api::background::EreporterStatus;
 use nexus_types::internal_api::background::InstanceReincarnationStatus;
 use nexus_types::internal_api::background::InstanceUpdaterStatus;
@@ -1477,6 +1478,26 @@ fn print_task_blueprint_loader(details: &serde_json::Value) {
     }
 }
 
+fn print_datasets_rendezvous_stats(
+    stats: &DatasetsRendezvousStats,
+    dataset_name: &'static str,
+) {
+    let DatasetsRendezvousStats {
+        num_inserted,
+        num_already_exist,
+        num_not_in_inventory,
+        num_tombstoned,
+        num_already_tombstoned,
+    } = stats;
+
+    println!("    {dataset_name} rendezvous counts:");
+    println!("        num_inserted:           {num_inserted}");
+    println!("        num_already_exist:      {num_already_exist}");
+    println!("        num_not_in_inventory:   {num_not_in_inventory}");
+    println!("        num_tombstoned:         {num_tombstoned}");
+    println!("        num_already_tombstoned: {num_already_tombstoned}");
+}
+
 fn print_task_blueprint_rendezvous(details: &serde_json::Value) {
     match serde_json::from_value::<BlueprintRendezvousStatus>(details.clone()) {
         Err(error) => eprintln!(
@@ -1489,27 +1510,13 @@ fn print_task_blueprint_rendezvous(details: &serde_json::Value) {
                 "    inventory collection: {}",
                 status.inventory_collection_id
             );
-            println!("    debug_dataset rendezvous counts:");
-            println!(
-                "        num_inserted:           {}",
-                status.stats.debug_dataset.num_inserted
-            );
-            println!(
-                "        num_already_exist:      {}",
-                status.stats.debug_dataset.num_already_exist
-            );
-            println!(
-                "        num_not_in_inventory:   {}",
-                status.stats.debug_dataset.num_not_in_inventory
-            );
-            println!(
-                "        num_tombstoned:         {}",
-                status.stats.debug_dataset.num_tombstoned
-            );
-            println!(
-                "        num_already_tombstoned: {}",
-                status.stats.debug_dataset.num_already_tombstoned
+
+            print_datasets_rendezvous_stats(
+                &status.stats.debug_dataset,
+                "debug_dataset",
             );
+
+            // crucible datasets have a different number of rendezvous stats
             println!("    crucible_dataset rendezvous counts:");
             println!(
                 "        num_inserted:         {}",
@@ -1523,6 +1530,11 @@ fn print_task_blueprint_rendezvous(details: &serde_json::Value) {
                 "        num_not_in_inventory: {}",
                 status.stats.crucible_dataset.num_not_in_inventory
             );
+
+            print_datasets_rendezvous_stats(
+                &status.stats.local_storage_dataset,
+                "local_storage_dataset",
+            );
         }
     }
 }

dev-tools/omdb/tests/successes.out

@@ -580,6 +580,12 @@ task: "blueprint_rendezvous"
         num_inserted:         0
         num_already_exist:    0
         num_not_in_inventory: 0
+    local_storage_dataset rendezvous counts:
+        num_inserted:           0
+        num_already_exist:      0
+        num_not_in_inventory:   0
+        num_tombstoned:         0
+        num_already_tombstoned: 0
 
 task: "crdb_node_id_collector"
   configured period: every <REDACTED_DURATION>m
@@ -1115,6 +1121,12 @@ task: "blueprint_rendezvous"
         num_inserted:         0
         num_already_exist:    0
         num_not_in_inventory: 0
+    local_storage_dataset rendezvous counts:
+        num_inserted:           0
+        num_already_exist:      0
+        num_not_in_inventory:   0
+        num_tombstoned:         0
+        num_already_tombstoned: 0
 
 task: "crdb_node_id_collector"
   configured period: every <REDACTED_DURATION>m