fix chunk_size of virtual devicemay not be aligned with blk_size issue

eBay · Oct 7, 2023 · 9b05081 · 9b05081
1 parent bf8e6fd
commit 9b05081
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/conanfile.py b/conanfile.py
@@ -5,7 +5,7 @@
 
 class HomestoreConan(ConanFile):
     name = "homestore"
-    version = "4.5.3"
+    version = "4.5.4"
 
     homepage = "https://github.com/eBay/Homestore"
     description = "HomeStore Storage Engine"

diff --git a/src/lib/device/device_manager.cpp b/src/lib/device/device_manager.cpp
@@ -205,14 +205,7 @@ shared< VirtualDev > DeviceManager::create_vdev(vdev_parameters&& vparam) {
         pdevs.erase(pdevs.begin() + 1, pdevs.end()); // TODO: Pick random one
     }
 
-    auto input_vdev_size = vparam.vdev_size;
-    vparam.vdev_size = sisl::round_up(vparam.vdev_size, vparam.num_chunks * vparam.blk_size);
-    if (input_vdev_size != vparam.vdev_size) {
-        LOGINFO("{} Virtual device is attempted to be created with size={}, it needs to be rounded to new_size={}",
-                vparam.vdev_name, in_bytes(input_vdev_size), in_bytes(vparam.vdev_size));
-    }
-
-    // Adjust the maximum number chunks requested.
+    // Adjust the maximum number chunks requested before round up vdev size.
     uint32_t max_num_chunks = 0;
     for (const auto& d : m_dev_infos) {
         max_num_chunks += hs_super_blk::max_chunks_in_pdev(d);
@@ -224,6 +217,14 @@ shared< VirtualDev > DeviceManager::create_vdev(vdev_parameters&& vparam) {
                 "new_num_chunks={}",
                 vparam.vdev_name, in_bytes(input_num_chunks), in_bytes(vparam.num_chunks));
     }
+
+    auto input_vdev_size = vparam.vdev_size;
+    vparam.vdev_size = sisl::round_up(vparam.vdev_size, vparam.num_chunks * vparam.blk_size);
+    if (input_vdev_size != vparam.vdev_size) {
+        LOGINFO("{} Virtual device is attempted to be created with size={}, it needs to be rounded to new_size={}",
+                vparam.vdev_name, in_bytes(input_vdev_size), in_bytes(vparam.vdev_size));
+    }
+
     uint32_t chunk_size = vparam.vdev_size / vparam.num_chunks;
 
     LOGINFO(