Issue 85: Expose data service drive type info to BM (#87)

* Issue 85: expose storage info

* Issue 85: expose storage info

* Issue 85: HomeBlks to expose data service drive info

* con ver

Author: yamingk

conanfile.py

@@ -9,7 +9,7 @@
 
 class HomeBlocksConan(ConanFile):
     name = "homeblocks"
-    version = "0.0.14"
+    version = "0.0.15"
     homepage = "https://github.com/eBay/HomeBlocks"
     description = "Block Store built on HomeStore"
     topics = ("ebay")

src/include/homeblks/home_blks.hpp

@@ -15,7 +15,7 @@
 #pragma once
 
 #include <list>
-
+#include <iomgr/iomgr_types.hpp>
 #include <sisl/utility/enum.hpp>
 
 #include "common.hpp"
@@ -77,6 +77,7 @@ class HomeBlocks {
     virtual peer_id_t our_uuid() const = 0;
     virtual std::shared_ptr< VolumeManager > volume_manager() = 0;
     virtual HomeBlocksStats get_stats() const = 0;
+    virtual iomgr::drive_type data_drive_type() const = 0;
 };
 
 extern std::shared_ptr< HomeBlocks > init_homeblocks(std::weak_ptr< HomeBlocksApplication >&& application);

src/lib/homeblks_impl.cpp

@@ -38,6 +38,17 @@ extern std::shared_ptr< HomeBlocks > init_homeblocks(std::weak_ptr< HomeBlocksAp
     return inst;
 }
 
+iomgr::drive_type HomeBlocksImpl::data_drive_type() const {
+    auto const dtype = homestore::hs()->data_service().get_dev_type();
+    if (dtype == homestore::HSDevType::Data) {
+        return iomgr::drive_type::block_hdd;
+    } else if (dtype == homestore::HSDevType::Fast) {
+        return iomgr::drive_type::block_nvme;
+    } else {
+        return iomgr::drive_type::unknown;
+    }
+}
+
 HomeBlocksStats HomeBlocksImpl::get_stats() const {
     auto const stats = homestore::hs()->repl_service().get_cap_stats();
     return {stats.total_capacity, stats.used_capacity};

src/lib/homeblks_impl.hpp

@@ -82,6 +82,8 @@ class HomeBlocksImpl : public HomeBlocks, public VolumeManager, public std::enab
     /// HomeBlocks
     /// Returns the UUID of this HomeBlocks.
     HomeBlocksStats get_stats() const final;
+    iomgr::drive_type data_drive_type() const final;
+
     peer_id_t our_uuid() const final {
         // not expected to be called;
         return peer_id_t{};
@@ -94,17 +96,14 @@ class HomeBlocksImpl : public HomeBlocks, public VolumeManager, public std::enab
 
     VolumePtr lookup_volume(const volume_id_t& id) final;
 
-    NullAsyncResult write(const VolumePtr& vol, const vol_interface_req_ptr& req,
-        bool part_of_batch = false) final;
+    NullAsyncResult write(const VolumePtr& vol, const vol_interface_req_ptr& req, bool part_of_batch = false) final;
 
-    NullAsyncResult read(const VolumePtr& vol, const vol_interface_req_ptr& req,
-        bool part_of_batch = false) final;
+    NullAsyncResult read(const VolumePtr& vol, const vol_interface_req_ptr& req, bool part_of_batch = false) final;
 
     NullAsyncResult unmap(const VolumePtr& vol, const vol_interface_req_ptr& req) final;
 
     void submit_io_batch() final;
 
-
     // see api comments in base class;
     bool get_stats(volume_id_t id, VolumeStats& stats) const final;
     void get_volume_ids(std::vector< volume_id_t >& vol_ids) const final;

src/lib/volume/tests/test_volume.cpp

@@ -65,7 +65,7 @@ class VolumeTest : public ::testing::Test {
 #endif
 };
 
-TEST_F(VolumeTest, CreateVolumeThenRecover) {
+TEST_F(VolumeTest, CreateDestroyVolume) {
     std::vector< volume_id_t > vol_ids;
     {
         auto hb = g_helper->inst();
@@ -86,29 +86,25 @@ TEST_F(VolumeTest, CreateVolumeThenRecover) {
         }
 
         auto const s = hb->get_stats();
-        LOGINFO("Stats: {}", s.to_string());
-    }
-
-    g_helper->restart(5);
+        auto const dtype = hb->data_drive_type();
+        LOGINFO("Stats: {}, drive_type: {}", s.to_string(), dtype);
 
-    // verify the volumes are still there
-    {
-        auto hb = g_helper->inst();
-        auto vol_mgr = hb->volume_manager();
-
-        for (const auto& id : vol_ids) {
+        for (uint32_t i = 0; i < num_vols; ++i) {
+            auto id = vol_ids[i];
+            auto ret = vol_mgr->remove_volume(id).get();
+            ASSERT_TRUE(ret);
+            // sleep for a while
+            std::this_thread::sleep_for(std::chrono::milliseconds(2000));
             auto vinfo_ptr = vol_mgr->lookup_volume(id);
-            // verify the volume is there
-            ASSERT_TRUE(vinfo_ptr != nullptr);
+            // verify the volume is not there
+            ASSERT_TRUE(vinfo_ptr == nullptr);
         }
     }
-}
 
-TEST_F(VolumeTest, DestroyVolumeCrashRecovery) {
+    g_helper->restart(5);
+}
 
-#ifdef _PRERELEASE
-    set_flip_point("vol_destroy_crash_simulation");
-#endif
+TEST_F(VolumeTest, CreateVolumeThenRecover) {
     std::vector< volume_id_t > vol_ids;
     {
         auto hb = g_helper->inst();
@@ -127,18 +123,28 @@ TEST_F(VolumeTest, DestroyVolumeCrashRecovery) {
             // verify the volume is there
             ASSERT_TRUE(vinfo_ptr != nullptr);
         }
-
-        for (uint32_t i = 0; i < num_vols; ++i) {
-            auto id = vol_ids[i];
-            auto ret = vol_mgr->remove_volume(id).get();
-            ASSERT_TRUE(ret);
-        }
     }
 
     g_helper->restart(5);
+
+    // verify the volumes are still there
+    {
+        auto hb = g_helper->inst();
+        auto vol_mgr = hb->volume_manager();
+
+        for (const auto& id : vol_ids) {
+            auto vinfo_ptr = vol_mgr->lookup_volume(id);
+            // verify the volume is there
+            ASSERT_TRUE(vinfo_ptr != nullptr);
+        }
+    }
 }
 
-TEST_F(VolumeTest, CreateDestroyVolume) {
+TEST_F(VolumeTest, DestroyVolumeCrashRecovery) {
+
+#ifdef _PRERELEASE
+    set_flip_point("vol_destroy_crash_simulation");
+#endif
     std::vector< volume_id_t > vol_ids;
     {
         auto hb = g_helper->inst();
@@ -162,13 +168,10 @@ TEST_F(VolumeTest, CreateDestroyVolume) {
             auto id = vol_ids[i];
             auto ret = vol_mgr->remove_volume(id).get();
             ASSERT_TRUE(ret);
-            // sleep for a while
-            std::this_thread::sleep_for(std::chrono::milliseconds(2000));
-            auto vinfo_ptr = vol_mgr->lookup_volume(id);
-            // verify the volume is not there
-            ASSERT_TRUE(vinfo_ptr == nullptr);
         }
     }
+
+    g_helper->restart(5);
 }
 
 int main(int argc, char* argv[]) {

src/lib/volume/volume.cpp

@@ -80,12 +80,14 @@ bool Volume::init(bool is_recovery) {
         auto ret = homestore::hs()->repl_service().get_repl_dev(id());
 
         if (ret.hasError()) {
-            LOGE("Failed to get repl dev for volume name: {}, uuid: {}, error: {}", vol_info_->name,
-                 boost::uuids::to_string(vol_info_->id), ret.error());
-            DEBUG_ASSERT(false, "Failed to get repl dev for volume");
-            return false;
+            LOGI("Volume in destroying state? Failed to get repl dev for volume name: {}, uuid: {}, error: {}",
+                 vol_info_->name, boost::uuids::to_string(vol_info_->id), ret.error());
+            rd_ = nullptr;
+            // DEBUG_ASSERT(false, "Failed to get repl dev for volume");
+            // return false;
+        } else {
+            rd_ = ret.value();
         }
-        rd_ = ret.value();
 
         // index table will be recovered via in subsequent callback with init_index_table API;
     }
@@ -96,6 +98,13 @@ void Volume::destroy() {
     // 0. Set destroying state in superblock;
     state_change(vol_state::DESTROYING);
 
+    // 1. destroy the repl dev;
+    if (rd_) {
+        LOGI("Destroying repl dev for volume: {}, uuid: {}", vol_info_->name, boost::uuids::to_string(id()));
+        homestore::hs()->repl_service().remove_repl_dev(id()).get();
+        rd_ = nullptr;
+    }
+
 #ifdef _PRERELEASE
     if (iomgr_flip::instance()->test_flip("vol_destroy_crash_simulation")) {
         // this is to simulate crash during volume destroy;
@@ -105,13 +114,6 @@ void Volume::destroy() {
     }
 #endif
 
-    // 1. destroy the repl dev;
-    if (rd_) {
-        LOGI("Destroying repl dev for volume: {}, uuid: {}", vol_info_->name, boost::uuids::to_string(id()));
-        homestore::hs()->repl_service().remove_repl_dev(id()).get();
-        rd_ = nullptr;
-    }
-
     // 2. destroy the index table;
     if (indx_tbl_) {
         LOGI("Destroying index table for volume: {}, uuid: {}", vol_info_->name, boost::uuids::to_string(id()));