Merge #1909

1909: call spdk_bs_get_max_growable_size for max_expandable_size r=abhilashshetty04 a=abhilashshetty04



Co-authored-by: Abhilash Shetty <[email protected]>

Author: mayastor-bors

io-engine-tests/src/lib.rs

@@ -196,6 +196,14 @@ pub fn truncate_file_bytes(path: &str, size: u64) {
     assert!(output.status.success());
 }
 
+pub fn expand_tempfs_file_bytes(path: &str, size: u64) {
+    let output = Command::new("truncate")
+        .args(["-s", &format!("+{size}"), path])
+        .output()
+        .expect("failed exec truncate");
+    assert!(output.status.success());
+}
+
 /// Automatically assign a loopdev to path
 pub fn setup_loopdev_file(path: &str, sector_size: Option<u64>) -> String {
     let log_sec = sector_size.unwrap_or(512);

io-engine/src/lvs/lvs_store.rs

@@ -9,12 +9,13 @@ use pin_utils::core_reexport::fmt::Formatter;
 
 use spdk_rs::libspdk::{
     bdev_aio_rescan, spdk_bdev_update_bs_blockcnt, spdk_blob_store, spdk_bs_free_cluster_count,
-    spdk_bs_get_cluster_size, spdk_bs_get_md_len, spdk_bs_get_page_size, spdk_bs_get_used_md,
-    spdk_bs_total_data_cluster_count, spdk_lvol, spdk_lvol_opts, spdk_lvol_opts_init,
-    spdk_lvol_store, spdk_lvs_grow_live, vbdev_get_lvol_store_by_name,
-    vbdev_get_lvol_store_by_uuid, vbdev_get_lvs_bdev_by_lvs, vbdev_lvol_create_with_opts,
-    vbdev_lvs_create, vbdev_lvs_create_with_uuid, vbdev_lvs_destruct, vbdev_lvs_import,
-    vbdev_lvs_unload, LVOL_CLEAR_WITH_NONE, LVOL_CLEAR_WITH_UNMAP, LVS_CLEAR_WITH_NONE,
+    spdk_bs_get_cluster_size, spdk_bs_get_max_growable_size, spdk_bs_get_md_len,
+    spdk_bs_get_page_size, spdk_bs_get_used_md, spdk_bs_total_data_cluster_count, spdk_lvol,
+    spdk_lvol_opts, spdk_lvol_opts_init, spdk_lvol_store, spdk_lvs_grow_live,
+    vbdev_get_lvol_store_by_name, vbdev_get_lvol_store_by_uuid, vbdev_get_lvs_bdev_by_lvs,
+    vbdev_lvol_create_with_opts, vbdev_lvs_create, vbdev_lvs_create_with_uuid, vbdev_lvs_destruct,
+    vbdev_lvs_import, vbdev_lvs_unload, LVOL_CLEAR_WITH_NONE, LVOL_CLEAR_WITH_UNMAP,
+    LVS_CLEAR_WITH_NONE,
 };
 use url::Url;
 
@@ -211,8 +212,8 @@ impl Lvs {
 
     /// Size upto which blobstore can be expanded.
     pub fn max_expandable_size(&self) -> Option<u64> {
-        // TODO: Use spdk function when changes gets merged.
-        Some(0)
+        let s = unsafe { spdk_bs_get_max_growable_size(self.blob_store()) };
+        Some(s)
     }
 
     /// returns the UUID of the lvs

io-engine/tests/lvs_grow.rs

@@ -44,9 +44,11 @@ fn approx_eq(a: f64, b: f64, t: f64) -> bool {
 }
 
 /// Pool stats.
+#[derive(Debug)]
 struct TestPoolStats {
     capacity: u64,
     disk_capacity: u64,
+    max_expandable_size: u64,
 }
 
 impl TestPoolStats {
@@ -60,6 +62,7 @@ impl From<&Lvs> for TestPoolStats {
         Self {
             capacity: lvs.capacity(),
             disk_capacity: lvs.disk_capacity(),
+            max_expandable_size: lvs.max_expandable_size().unwrap(),
         }
     }
 }
@@ -75,6 +78,7 @@ impl From<Pool> for TestPoolStats {
         Self {
             capacity: p.capacity,
             disk_capacity: p.disk_capacity,
+            max_expandable_size: p.max_expandable_size.unwrap(),
         }
     }
 }
@@ -356,9 +360,11 @@ async fn lvs_grow_api_aio() {
         }
 
         async fn grow_device(&mut self) -> u64 {
-            // Resize bdev's backing file.
-            common::truncate_file(DISK_NAME, 128 * 1024);
-            self.device_size().await + (128 * 1024)
+            let pool = self.pool_stats().await;
+            // Resize bdev's backing file to maximum expandable size.
+            let expand_by = pool.max_expandable_size - pool.disk_capacity;
+            common::expand_tempfs_file_bytes(DISK_NAME, expand_by);
+            self.device_size().await + expand_by
         }
 
         fn is_malloc(&self) -> bool {