[inventory] Add Sled Agent datasets to inventory

clients/sled-agent-client/src/lib.rs

@@ -70,6 +70,7 @@ progenitor::generate_api!(
         SledRole = nexus_sled_agent_shared::inventory::SledRole,
         SourceNatConfig = omicron_common::api::internal::shared::SourceNatConfig,
         SwitchLocation = omicron_common::api::external::SwitchLocation,
+        TypedUuidForDatasetKind = omicron_uuid_kinds::DatasetUuid,
         TypedUuidForInstanceKind = omicron_uuid_kinds::InstanceUuid,
         TypedUuidForPropolisKind = omicron_uuid_kinds::PropolisUuid,
         TypedUuidForZpoolKind = omicron_uuid_kinds::ZpoolUuid,

common/src/api/external/mod.rs

@@ -593,7 +593,18 @@ impl JsonSchema for RoleName {
 //
 // TODO: custom JsonSchema impl to describe i64::MAX limit; this is blocked by
 // https://github.com/oxidecomputer/typify/issues/589
-#[derive(Copy, Clone, Debug, Serialize, JsonSchema, PartialEq, Eq)]
+#[derive(
+    Copy,
+    Clone,
+    Debug,
+    Serialize,
+    JsonSchema,
+    Hash,
+    PartialEq,
+    Eq,
+    PartialOrd,
+    Ord,
+)]
 pub struct ByteCount(u64);
 
 impl<'de> Deserialize<'de> for ByteCount {

common/src/disk.rs

@@ -14,7 +14,7 @@ use std::fmt;
 use uuid::Uuid;
 
 use crate::{
-    api::external::Generation,
+    api::external::{ByteCount, Generation},
     ledger::Ledgerable,
     zpool_name::{ZpoolKind, ZpoolName},
 };
@@ -244,10 +244,10 @@ pub struct DatasetConfig {
     pub compression: CompressionAlgorithm,
 
     /// The upper bound on the amount of storage used by this dataset
-    pub quota: Option<usize>,
+    pub quota: Option<ByteCount>,
 
     /// The lower bound on the amount of storage usable by this dataset
-    pub reservation: Option<usize>,
+    pub reservation: Option<ByteCount>,
 }
 
 #[derive(

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

@@ -4744,6 +4744,44 @@ fn inv_collection_print_sleds(collection: &Collection) {
             sled.reservoir_size.to_whole_gibibytes()
         );
 
+        if !sled.zpools.is_empty() {
+            println!("    physical disks:");
+        }
+        for disk in &sled.disks {
+            let nexus_types::inventory::PhysicalDisk {
+                identity,
+                variant,
+                slot,
+            } = disk;
+            println!("      {variant:?}: {identity:?} in {slot}");
+        }
+
+        if !sled.zpools.is_empty() {
+            println!("    zpools");
+        }
+        for zpool in &sled.zpools {
+            let nexus_types::inventory::Zpool { id, total_size, .. } = zpool;
+            println!("      {id}: total size: {total_size}");
+        }
+
+        if !sled.datasets.is_empty() {
+            println!("    datasets:");
+        }
+        for dataset in &sled.datasets {
+            let nexus_types::inventory::Dataset {
+                id,
+                name,
+                available,
+                used,
+                quota,
+                reservation,
+                compression,
+            } = dataset;
+            println!("      {name} - id: {id:?}, compression: {compression}");
+            println!("        available: {available}, used: {used}");
+            println!("        reservation: {reservation:?}, quota: {quota:?}");
+        }
+
         if let Some(zones) = collection.omicron_zones.get(&sled.sled_id) {
             println!(
                 "    zones collected from {} at {}",

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

@@ -38,6 +38,10 @@ enum SledAgentCommands {
     #[clap(subcommand)]
     Zpools(ZpoolCommands),
 
+    /// print information about datasets
+    #[clap(subcommand)]
+    Datasets(DatasetCommands),
+
     /// print information about the local bootstore node
     #[clap(subcommand)]
     Bootstore(BootstoreCommands),
@@ -55,6 +59,16 @@ enum ZpoolCommands {
     List,
 }
 
+#[derive(Debug, Subcommand)]
+enum DatasetCommands {
+    /// Print list of all datasets the sled agent is configured to manage
+    ///
+    /// Note that the set of actual datasets on the sled may be distinct,
+    /// use the `omdb db inventory collections show` command to see the latest
+    /// set of datasets collected from sleds.
+    List,
+}
+
 #[derive(Debug, Subcommand)]
 enum BootstoreCommands {
     /// Show the internal state of the local bootstore node
@@ -86,6 +100,9 @@ impl SledAgentArgs {
             SledAgentCommands::Zpools(ZpoolCommands::List) => {
                 cmd_zpools_list(&client).await
             }
+            SledAgentCommands::Datasets(DatasetCommands::List) => {
+                cmd_datasets_list(&client).await
+            }
             SledAgentCommands::Bootstore(BootstoreCommands::Status) => {
                 cmd_bootstore_status(&client).await
             }
@@ -130,6 +147,26 @@ async fn cmd_zpools_list(
     Ok(())
 }
 
+/// Runs `omdb sled-agent datasets list`
+async fn cmd_datasets_list(
+    client: &sled_agent_client::Client,
+) -> Result<(), anyhow::Error> {
+    let response = client.datasets_get().await.context("listing datasets")?;
+    let response = response.into_inner();
+
+    println!("dataset configuration @ generation {}:", response.generation);
+    let datasets = response.datasets;
+
+    if datasets.is_empty() {
+        println!("    <none>");
+    }
+    for dataset in &datasets {
+        println!("    {:?}", dataset);
+    }
+
+    Ok(())
+}
+
 /// Runs `omdb sled-agent bootstore status`
 async fn cmd_bootstore_status(
     client: &sled_agent_client::Client,

dev-tools/omdb/tests/usage_errors.out

@@ -642,6 +642,7 @@ Usage: omdb sled-agent [OPTIONS] <COMMAND>
 Commands:
   zones      print information about zones
   zpools     print information about zpools
+  datasets   print information about datasets
   bootstore  print information about the local bootstore node
   help       Print this message or the help of the given subcommand(s)