Expose metadata version on D-Bus

src/dbus_api/consts.rs

@@ -45,6 +45,7 @@ pub const POOL_ALLOC_SIZE_PROP: &str = "AllocatedSize";
 pub const POOL_FS_LIMIT_PROP: &str = "FsLimit";
 pub const POOL_OVERPROV_PROP: &str = "Overprovisioning";
 pub const POOL_NO_ALLOCABLE_SPACE_PROP: &str = "NoAllocSpace";
+pub const POOL_METADATA_VERSION_PROP: &str = "MetadataVersion";
 
 pub const FILESYSTEM_INTERFACE_NAME_3_0: &str = "org.storage.stratis3.filesystem.r0";
 pub const FILESYSTEM_INTERFACE_NAME_3_1: &str = "org.storage.stratis3.filesystem.r1";

src/dbus_api/pool/mod.rs

@@ -17,6 +17,7 @@ mod pool_3_0;
 mod pool_3_1;
 mod pool_3_3;
 mod pool_3_5;
+mod pool_3_6;
 pub mod prop_conv;
 mod shared;
 
@@ -239,7 +240,8 @@ pub fn create_dbus_pool<'a>(
                 .add_p(pool_3_0::total_size_property(&f))
                 .add_p(pool_3_1::fs_limit_property(&f))
                 .add_p(pool_3_1::enable_overprov_property(&f))
-                .add_p(pool_3_1::no_alloc_space_property(&f)),
+                .add_p(pool_3_1::no_alloc_space_property(&f))
+                .add_p(pool_3_6::metadata_version_property(&f)),
         );
 
     let path = object_path.get_name().to_owned();
@@ -355,7 +357,8 @@ pub fn get_pool_properties(
             consts::POOL_TOTAL_SIZE_PROP => shared::pool_total_size(pool),
             consts::POOL_FS_LIMIT_PROP => shared::pool_fs_limit(pool),
             consts::POOL_OVERPROV_PROP => shared::pool_overprov_enabled(pool),
-            consts::POOL_NO_ALLOCABLE_SPACE_PROP => shared::pool_no_alloc_space(pool)
+            consts::POOL_NO_ALLOCABLE_SPACE_PROP => shared::pool_no_alloc_space(pool),
+            consts::POOL_METADATA_VERSION_PROP => shared::pool_metadata_version(pool)
         }
     }
 }

src/dbus_api/pool/pool_3_6/api.rs

@@ -0,0 +1,16 @@
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+use dbus_tree::{Access, EmitsChangedSignal, Factory, MTSync, Property};
+
+use crate::dbus_api::{consts, pool::pool_3_6::props::get_pool_metadata_version, types::TData};
+
+pub fn metadata_version_property(
+    f: &Factory<MTSync<TData>, TData>,
+) -> Property<MTSync<TData>, TData> {
+    f.property::<u64, _>(consts::POOL_METADATA_VERSION_PROP, ())
+        .access(Access::Read)
+        .emits_changed(EmitsChangedSignal::Const)
+        .on_get(get_pool_metadata_version)
+}

src/dbus_api/pool/pool_3_6/mod.rs

@@ -0,0 +1,8 @@
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+mod api;
+mod props;
+
+pub use api::metadata_version_property;

src/dbus_api/pool/pool_3_6/props.rs

@@ -0,0 +1,18 @@
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+use dbus::arg::IterAppend;
+use dbus_tree::{MTSync, MethodErr, PropInfo};
+
+use crate::dbus_api::{
+    pool::shared::{self, get_pool_property},
+    types::TData,
+};
+
+pub fn get_pool_metadata_version(
+    i: &mut IterAppend<'_>,
+    p: &PropInfo<'_, MTSync<TData>, TData>,
+) -> Result<(), MethodErr> {
+    get_pool_property(i, p, |(_, _, pool)| Ok(shared::pool_metadata_version(pool)))
+}

src/dbus_api/pool/shared.rs

@@ -321,6 +321,12 @@ pub fn pool_fs_limit(pool: &dyn Pool) -> u64 {
     pool.fs_limit()
 }
 
+/// Generate a D-Bus representation of the filesystem limit on the pool.
+#[inline]
+pub fn pool_metadata_version(pool: &dyn Pool) -> u64 {
+    pool.metadata_version() as u64
+}
+
 /// Set the filesystem limit on a pool.
 #[inline]
 pub fn set_pool_fs_limit(

src/engine/engine.rs

@@ -328,6 +328,9 @@ pub trait Pool: Debug + Send + Sync {
         pool_uuid: PoolUuid,
         device: DevUuid,
     ) -> StratisResult<(GrowAction<(PoolUuid, DevUuid)>, Option<PoolDiff>)>;
+
+    /// Get the metadata version for a given pool.
+    fn metadata_version(&self) -> StratSigblockVersion;
 }
 
 pub type HandleEvents<P> = (

src/engine/mod.rs

@@ -21,8 +21,8 @@ pub use self::{
         MaybeInconsistent, Name, PoolDiff, PoolEncryptionInfo, PoolIdentifier, PoolUuid,
         PropChangeAction, RenameAction, ReportType, SetCreateAction, SetDeleteAction,
         SetUnlockAction, StartAction, StopAction, StoppedPoolInfo, StoppedPoolsInfo,
-        StratBlockDevDiff, StratFilesystemDiff, StratPoolDiff, StratisUuid, ThinPoolDiff,
-        ToDisplay, UdevEngineEvent, UnlockMethod,
+        StratBlockDevDiff, StratFilesystemDiff, StratPoolDiff, StratSigblockVersion, StratisUuid,
+        ThinPoolDiff, ToDisplay, UdevEngineEvent, UnlockMethod,
     },
 };
 

src/engine/sim_engine/pool.rs

@@ -25,7 +25,7 @@ use crate::{
             ActionAvailability, BlockDevTier, Clevis, CreateAction, DeleteAction, DevUuid,
             EncryptionInfo, FilesystemUuid, GrowAction, Key, KeyDescription, Name, PoolDiff,
             PoolEncryptionInfo, PoolUuid, RegenAction, RenameAction, SetCreateAction,
-            SetDeleteAction,
+            SetDeleteAction, StratSigblockVersion,
         },
     },
     stratis::{StratisError, StratisResult},
@@ -691,6 +691,10 @@ impl Pool for SimPool {
     ) -> StratisResult<(GrowAction<(PoolUuid, DevUuid)>, Option<PoolDiff>)> {
         Ok((GrowAction::Identity, None))
     }
+
+    fn metadata_version(&self) -> StratSigblockVersion {
+        StratSigblockVersion::V2
+    }
 }
 
 #[cfg(test)]

src/engine/strat_engine/pool/shared.rs

@@ -16,6 +16,7 @@ use crate::{
             ActionAvailability, BlockDevTier, Clevis, CreateAction, DeleteAction, DevUuid,
             FilesystemUuid, GrowAction, Key, KeyDescription, Name, PoolDiff, PoolEncryptionInfo,
             PoolUuid, RegenAction, RenameAction, SetCreateAction, SetDeleteAction,
+            StratSigblockVersion,
         },
     },
     stratis::StratisResult,
@@ -315,4 +316,11 @@ impl Pool for AnyPool {
             AnyPool::V2(p) => p.grow_physical(name, pool_uuid, device),
         }
     }
+
+    fn metadata_version(&self) -> StratSigblockVersion {
+        match self {
+            AnyPool::V1(p) => p.metadata_version(),
+            AnyPool::V2(p) => p.metadata_version(),
+        }
+    }
 }

src/engine/strat_engine/pool/v1.rs

@@ -43,7 +43,7 @@ use crate::{
             ActionAvailability, BlockDevTier, Clevis, Compare, CreateAction, DeleteAction, DevUuid,
             Diff, FilesystemUuid, GrowAction, Key, KeyDescription, Name, PoolDiff,
             PoolEncryptionInfo, PoolUuid, RegenAction, RenameAction, SetCreateAction,
-            SetDeleteAction, StratFilesystemDiff, StratPoolDiff,
+            SetDeleteAction, StratFilesystemDiff, StratPoolDiff, StratSigblockVersion,
         },
     },
     stratis::{StratisError, StratisResult},
@@ -1228,6 +1228,10 @@ impl Pool for StratPool {
             Ok((GrowAction::Identity, None))
         }
     }
+
+    fn metadata_version(&self) -> StratSigblockVersion {
+        StratSigblockVersion::V1
+    }
 }
 
 pub struct StratPoolState {

src/engine/strat_engine/pool/v2.rs

@@ -34,7 +34,7 @@ use crate::{
             ActionAvailability, BlockDevTier, Clevis, Compare, CreateAction, DeleteAction, DevUuid,
             Diff, EncryptionInfo, FilesystemUuid, GrowAction, Key, KeyDescription, Name, PoolDiff,
             PoolEncryptionInfo, PoolUuid, RegenAction, RenameAction, SetCreateAction,
-            SetDeleteAction, StratFilesystemDiff, StratPoolDiff,
+            SetDeleteAction, StratFilesystemDiff, StratPoolDiff, StratSigblockVersion,
         },
     },
     stratis::{StratisError, StratisResult},
@@ -1129,6 +1129,10 @@ impl Pool for StratPool {
             Ok((GrowAction::Identity, None))
         }
     }
+
+    fn metadata_version(&self) -> StratSigblockVersion {
+        StratSigblockVersion::V2
+    }
 }
 
 pub struct StratPoolState {