From c9ceaa5e0fa431df8a7bab95510329480391614b Mon Sep 17 00:00:00 2001
From: mulhern <amulhern@redhat.com>
Date: Fri, 3 Jan 2025 09:54:32 -0500
Subject: [PATCH] Print the integrity spec when printing the metadata

Signed-off-by: mulhern <amulhern@redhat.com>
---
 src/engine/strat_engine/pool/inspection.rs | 25 +++++++++++++++++-----
 src/engine/types/mod.rs                    |  9 ++++++++
 2 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/src/engine/strat_engine/pool/inspection.rs b/src/engine/strat_engine/pool/inspection.rs
index ab2bfd6911..01ac2b7c52 100644
--- a/src/engine/strat_engine/pool/inspection.rs
+++ b/src/engine/strat_engine/pool/inspection.rs
@@ -10,7 +10,10 @@ use std::{
 use devicemapper::Sectors;
 
 use crate::{
-    engine::{strat_engine::serde_structs::PoolSave, types::DevUuid},
+    engine::{
+        strat_engine::serde_structs::PoolSave,
+        types::{DevUuid, ValidatedIntegritySpec},
+    },
     stratis::{StratisError, StratisResult},
 };
 
@@ -535,7 +538,9 @@ impl fmt::Display for FlexDevice {
 }
 
 // Calculate map of device UUIDs to data device representation from metadata.
-fn data_devices(metadata: &PoolSave) -> StratisResult<HashMap<DevUuid, DataDevice>> {
+fn data_devices(
+    metadata: &PoolSave,
+) -> StratisResult<(HashMap<DevUuid, DataDevice>, Option<ValidatedIntegritySpec>)> {
     let data_tier_metadata = &metadata.backstore.data_tier;
 
     let data_tier_devs = &data_tier_metadata.blockdev.devs;
@@ -570,7 +575,7 @@ fn data_devices(metadata: &PoolSave) -> StratisResult<HashMap<DevUuid, DataDevic
         }
     }
 
-    Ok(bds)
+    Ok((bds, data_tier_metadata.integrity_spec))
 }
 
 // Calculate map of device UUIDs to cache device representation from metadata.
@@ -669,7 +674,7 @@ pub mod inspectors {
 
         let encrypted = metadata.features.contains(&PoolFeatures::Encryption);
 
-        let data_devices = data_devices(metadata)?;
+        let (data_devices, _) = data_devices(metadata)?;
         for data_device in data_devices.values() {
             errors.extend(data_device.check());
         }
@@ -701,10 +706,20 @@ pub mod inspectors {
 
         let crypt_allocs = crypt_allocs(metadata)?;
         let flex_device = flex_device(metadata, encrypted)?;
-        let data_devices = data_devices(metadata)?;
+        let (data_devices, integrity_spec) = data_devices(metadata)?;
         let cache_devices = cache_devices(metadata)?;
         let cap_device = cap_device(metadata, encrypted)?;
 
+        println!("Integrity specification for data devices:");
+        println!(
+            "{}",
+            integrity_spec
+                .map(|s| s.to_string())
+                .unwrap_or_else(|| "None".into())
+        );
+
+        println!();
+
         println!("Allocations from each data device:");
         for (uuid, bd) in data_devices.iter() {
             println!("Data device: {uuid}");
diff --git a/src/engine/types/mod.rs b/src/engine/types/mod.rs
index a7e00fdb0e..80e1f93e54 100644
--- a/src/engine/types/mod.rs
+++ b/src/engine/types/mod.rs
@@ -572,3 +572,12 @@ impl TryFrom<IntegritySpec> for ValidatedIntegritySpec {
         })
     }
 }
+
+impl Display for ValidatedIntegritySpec {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        writeln!(f, "Allocate Superblock: {}", self.allocate_superblock)?;
+        writeln!(f, "Tag Specification: {}", self.tag_spec.as_ref())?;
+        writeln!(f, "Journal Size: {}", self.journal_size)?;
+        writeln!(f, "Block Size: {}", self.block_size)
+    }
+}