Store the real size in the StratBlockdev on setup

Signed-off-by: mulhern <[email protected]>
stratis-storage · Jun 8, 2021 · dd22674 · dd22674
1 parent 7e50154
commit dd22674
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 7 deletions.
diff --git a/src/engine/strat_engine/backstore/blockdev.rs b/src/engine/strat_engine/backstore/blockdev.rs
@@ -41,6 +41,7 @@ pub struct StratBlockDev {
     user_info: Option<String>,
     hardware_info: Option<String>,
     crypt_handle: Option<CryptHandle>,
+    real_size: BlockdevSize,
 }
 
 impl StratBlockDev {
@@ -65,6 +66,7 @@ impl StratBlockDev {
     ///
     /// Precondition: segments in other_segments do not overlap with Stratis
     /// metadata region.
+    #[allow(clippy::too_many_arguments)]
     pub fn new(
         dev: Device,
         devnode: &Path,
@@ -73,6 +75,7 @@ impl StratBlockDev {
         user_info: Option<String>,
         hardware_info: Option<String>,
         crypt_handle: Option<CryptHandle>,
+        real_size: BlockdevSize,
     ) -> StratisResult<StratBlockDev> {
         let mut segments = vec![(Sectors(0), bda.extended_size().sectors())];
         segments.extend(other_segments);
@@ -90,6 +93,7 @@ impl StratBlockDev {
             user_info,
             hardware_info,
             crypt_handle,
+            real_size,
         })
     }
 

diff --git a/src/engine/strat_engine/backstore/devices.rs b/src/engine/strat_engine/backstore/devices.rs
@@ -481,7 +481,16 @@ pub fn initialize_devices(
 
         bda.initialize(&mut f)?;
 
-        StratBlockDev::new(devno, physical_path, bda, &[], None, hw_id, crypt_handle)
+        StratBlockDev::new(
+            devno,
+            physical_path,
+            bda,
+            &[],
+            None,
+            hw_id,
+            crypt_handle,
+            data_size,
+        )
     }
 
     /// Clean up an encrypted device after initialization failure.

diff --git a/src/engine/strat_engine/liminal/setup.rs b/src/engine/strat_engine/liminal/setup.rs
@@ -20,7 +20,7 @@ use crate::{
             backstore::{CryptHandle, StratBlockDev},
             device::blkdev_size,
             liminal::device_info::LStratisInfo,
-            metadata::{StaticHeader, BDA},
+            metadata::{BlockdevSize, StaticHeader, BDA},
             serde_structs::{BackstoreSave, BaseBlockDevSave, PoolSave},
         },
         types::{BlockDevTier, DevUuid},
@@ -201,8 +201,8 @@ pub fn get_blockdevs(
         // Return an error if apparent size of Stratis block device appears to
         // have decreased since metadata was recorded or if size of block
         // device could not be obtained.
-        blkdev_size(&OpenOptions::new().read(true).open(&info.ids.devnode)?).and_then(
-            |actual_size| {
+        let real_size = blkdev_size(&OpenOptions::new().read(true).open(&info.ids.devnode)?)
+            .and_then(|actual_size| {
                 let actual_size_sectors = actual_size.sectors();
                 let recorded_size = bda.dev_size().sectors();
                 if actual_size_sectors < recorded_size {
@@ -214,10 +214,9 @@ pub fn get_blockdevs(
                 );
                     Err(StratisError::Engine(ErrorEnum::Error, err_msg))
                 } else {
-                    Ok(())
+                    Ok(BlockdevSize::new(actual_size.sectors()))
                 }
-            },
-        )?;
+            })?;
 
         let dev_uuid = bda.dev_uuid();
 
@@ -260,6 +259,7 @@ pub fn get_blockdevs(
                 bd_save.user_info.clone(),
                 bd_save.hardware_info.clone(),
                 handle,
+                real_size,
             )?,
         ))
     }