Add merge_scheduled field to filesystem

Signed-off-by: mulhern <amulhern@redhat.com>

src/dbus_api/consts.rs

@@ -67,6 +67,7 @@ pub const FILESYSTEM_CREATED_PROP: &str = "Created";
 pub const FILESYSTEM_SIZE_PROP: &str = "Size";
 pub const FILESYSTEM_SIZE_LIMIT_PROP: &str = "SizeLimit";
 pub const FILESYSTEM_ORIGIN_PROP: &str = "Origin";
+pub const FILESYSTEM_MERGE_SCHEDULED_PROP: &str = "MergeScheduled";
 
 pub const BLOCKDEV_INTERFACE_NAME_3_0: &str = "org.storage.stratis3.blockdev.r0";
 pub const BLOCKDEV_INTERFACE_NAME_3_1: &str = "org.storage.stratis3.blockdev.r1";

src/dbus_api/filesystem/filesystem_3_7/api.rs

@@ -4,11 +4,24 @@
 
 use dbus_tree::{Access, EmitsChangedSignal, Factory, MTSync, Property};
 
-use crate::dbus_api::{consts, filesystem::filesystem_3_7::props::get_fs_origin, types::TData};
+use crate::dbus_api::{
+    consts,
+    filesystem::filesystem_3_7::props::{get_fs_merge_scheduled, get_fs_origin},
+    types::TData,
+};
 
 pub fn origin_property(f: &Factory<MTSync<TData>, TData>) -> Property<MTSync<TData>, TData> {
     f.property::<(bool, String), _>(consts::FILESYSTEM_ORIGIN_PROP, ())
         .access(Access::Read)
         .emits_changed(EmitsChangedSignal::True)
         .on_get(get_fs_origin)
 }
+
+pub fn merge_scheduled_property(
+    f: &Factory<MTSync<TData>, TData>,
+) -> Property<MTSync<TData>, TData> {
+    f.property::<bool, _>(consts::FILESYSTEM_MERGE_SCHEDULED_PROP, ())
+        .access(Access::Read)
+        .emits_changed(EmitsChangedSignal::True)
+        .on_get(get_fs_merge_scheduled)
+}

src/dbus_api/filesystem/filesystem_3_7/mod.rs

@@ -5,4 +5,4 @@
 mod api;
 mod props;
 
-pub use api::origin_property;
+pub use api::{merge_scheduled_property, origin_property};

src/dbus_api/filesystem/filesystem_3_7/props.rs

@@ -16,3 +16,10 @@ pub fn get_fs_origin(
 ) -> Result<(), MethodErr> {
     get_filesystem_property(i, p, |(_, _, f)| Ok(shared::fs_origin_prop(f)))
 }
+
+pub fn get_fs_merge_scheduled(
+    i: &mut IterAppend<'_>,
+    p: &PropInfo<'_, MTSync<TData>, TData>,
+) -> Result<(), MethodErr> {
+    get_filesystem_property(i, p, |(_, _, f)| Ok(shared::fs_merge_scheduled_prop(f)))
+}

src/dbus_api/filesystem/mod.rs

@@ -126,7 +126,8 @@ pub fn create_dbus_filesystem<'a>(
                 .add_p(filesystem_3_0::size_property(&f))
                 .add_p(filesystem_3_0::used_property(&f))
                 .add_p(filesystem_3_6::size_limit_property(&f))
-                .add_p(filesystem_3_7::origin_property(&f)),
+                .add_p(filesystem_3_7::origin_property(&f))
+                .add_p(filesystem_3_7::merge_scheduled_property(&f)),
         );
 
     let path = object_path.get_name().to_owned();
@@ -217,7 +218,8 @@ pub fn get_fs_properties(
             consts::FILESYSTEM_SIZE_PROP => shared::fs_size_prop(fs),
             consts::FILESYSTEM_USED_PROP => shared::fs_used_prop(fs),
             consts::FILESYSTEM_SIZE_LIMIT_PROP => shared::fs_size_limit_prop(fs),
-            consts::FILESYSTEM_ORIGIN_PROP => shared::fs_origin_prop(fs)
+            consts::FILESYSTEM_ORIGIN_PROP => shared::fs_origin_prop(fs),
+            consts::FILESYSTEM_MERGE_SCHEDULED_PROP => shared::fs_merge_scheduled_prop(fs)
         }
     }
 }

src/dbus_api/filesystem/shared.rs

@@ -207,3 +207,8 @@ pub fn fs_used_prop(fs: &dyn Filesystem) -> (bool, String) {
 pub fn fs_origin_prop(fs: &dyn Filesystem) -> (bool, String) {
     prop_conv::fs_origin_to_prop(fs.origin())
 }
+
+/// Generate D-Bus representation of merge scheduled property
+pub fn fs_merge_scheduled_prop(fs: &dyn Filesystem) -> bool {
+    fs.merge_scheduled()
+}

src/engine/engine.rs

@@ -96,6 +96,8 @@ pub trait Filesystem: Debug {
 
     /// Get filesystem snapshot origin.
     fn origin(&self) -> Option<FilesystemUuid>;
+
+    fn merge_scheduled(&self) -> bool;
 }
 
 pub trait BlockDev: Debug {

src/engine/sim_engine/filesystem.rs

@@ -21,6 +21,7 @@ pub struct SimFilesystem {
     size: Sectors,
     size_limit: Option<Sectors>,
     origin: Option<FilesystemUuid>,
+    merge_scheduled: bool,
 }
 
 impl SimFilesystem {
@@ -42,6 +43,7 @@ impl SimFilesystem {
             size,
             size_limit,
             origin,
+            merge_scheduled: false,
         })
     }
 
@@ -105,6 +107,10 @@ impl Filesystem for SimFilesystem {
     fn origin(&self) -> Option<FilesystemUuid> {
         self.origin
     }
+
+    fn merge_scheduled(&self) -> bool {
+        self.merge_scheduled
+    }
 }
 
 impl<'a> Into<Value> for &'a SimFilesystem {

src/engine/strat_engine/thinpool/filesystem.rs

@@ -52,6 +52,7 @@ pub struct StratFilesystem {
     used: Option<Bytes>,
     size_limit: Option<Sectors>,
     origin: Option<FilesystemUuid>,
+    merge_scheduled: bool,
 }
 
 fn init_used(thin_dev: &ThinDev) -> Option<Bytes> {
@@ -116,6 +117,7 @@ impl StratFilesystem {
                 created: Utc::now(),
                 size_limit,
                 origin: None,
+                merge_scheduled: false,
             },
         ))
     }
@@ -143,6 +145,7 @@ impl StratFilesystem {
             created,
             size_limit: fssave.fs_size_limit,
             origin: fssave.origin,
+            merge_scheduled: fssave.merge.unwrap_or_default(),
         })
     }
 
@@ -250,6 +253,7 @@ impl StratFilesystem {
                     created: Utc::now(),
                     size_limit: self.size_limit,
                     origin: Some(origin_uuid),
+                    merge_scheduled: false,
                 })
             }
             Err(e) => Err(StratisError::Msg(format!(
@@ -390,7 +394,7 @@ impl StratFilesystem {
             created: self.created.timestamp() as u64,
             fs_size_limit: self.size_limit,
             origin: self.origin,
-            merge: None,
+            merge: self.origin.map(|_| self.merge_scheduled),
         }
     }
 
@@ -494,6 +498,10 @@ impl Filesystem for StratFilesystem {
     fn origin(&self) -> Option<FilesystemUuid> {
         self.origin
     }
+
+    fn merge_scheduled(&self) -> bool {
+        self.merge_scheduled
+    }
 }
 
 /// Represents the state of the Stratis filesystem at a given moment in time.