More adoption on Index service

Signed-off-by: Xiaoxi Chen <[email protected]>
eBay · Mar 28, 2024 · dc1f7b4 · dc1f7b4
1 parent 0d8c1d0
commit dc1f7b4
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/src/lib/homestore.cpp b/src/lib/homestore.cpp
@@ -138,7 +138,11 @@ bool HomeStore::start(const hs_input_params& input, hs_before_services_starting_
 
     if (!m_dev_mgr->is_first_time_boot()) {
         m_dev_mgr->load_devices();
-        hs_utils::set_btree_mempool_size(m_dev_mgr->atomic_page_size({HSDevType::Fast}));
+        if (input.has_fast_dev()) {
+            hs_utils::set_btree_mempool_size(m_dev_mgr->atomic_page_size({HSDevType::Fast}));
+        } else {
+            hs_utils::set_btree_mempool_size(m_dev_mgr->atomic_page_size({HSDevType::Data}));
+        }
         do_start();
         return false;
     } else {
@@ -205,7 +209,12 @@ void HomeStore::format_and_start(std::map< uint32_t, hs_format_params >&& format
     }
 
     m_dev_mgr->format_devices();
-    hs_utils::set_btree_mempool_size(m_dev_mgr->atomic_page_size({HSDevType::Fast}));
+    if (HomeStoreStaticConfig::instance().input.has_fast_dev()) {
+        hs_utils::set_btree_mempool_size(m_dev_mgr->atomic_page_size({HSDevType::Fast}));
+    } else {
+        hs_utils::set_btree_mempool_size(m_dev_mgr->atomic_page_size({HSDevType::Data}));
+    }
+
 
     std::vector< folly::Future< std::error_code > > futs;
     for (const auto& [svc_type, fparams] : format_opts) {

diff --git a/src/lib/index/index_service.cpp b/src/lib/index/index_service.cpp
@@ -68,8 +68,7 @@ void IndexService::meta_blk_found(const sisl::byte_view& buf, void* meta_cookie)
 
 void IndexService::start() {
     // Start Writeback cache
-    m_wb_cache = std::make_unique< IndexWBCache >(m_vdev, hs()->evictor(),
-                                                  hs()->device_mgr()->atomic_page_size(HSDevType::Fast));
+    m_wb_cache = std::make_unique< IndexWBCache >(m_vdev, hs()->evictor(), m_vdev->atomic_page_size());
 
     // Register to CP for flush dirty buffers
     hs()->cp_mgr().register_consumer(cp_consumer_t::INDEX_SVC,
@@ -94,7 +93,7 @@ void IndexService::remove_index_table(const std::shared_ptr< IndexTableBase >& t
     m_index_map.erase(tbl->uuid());
 }
 
-uint32_t IndexService::node_size() const { return hs()->device_mgr()->atomic_page_size(HSDevType::Fast); }
+uint32_t IndexService::node_size() const { return m_vdev->atomic_page_size(); }
 
 uint64_t IndexService::used_size() const {
     auto size{0};