Adopt device type

conanfile.py

@@ -9,7 +9,7 @@
 
 class HomeObjectConan(ConanFile):
     name = "homeobject"
-    version = "1.0.16"
+    version = "1.1.1"
     homepage = "https://github.com/eBay/HomeObject"
     description = "Blob Store built on HomeReplication"
     topics = ("ebay")
@@ -40,8 +40,8 @@ def build_requirements(self):
         self.build_requires("gtest/1.14.0")
 
     def requirements(self):
-        self.requires("homestore/[>=6.2,      include_prerelease=True]@oss/master")
-        self.requires("sisl/[>=12.1, include_prerelease=True]@oss/master")
+        self.requires("homestore/[^6.2, include_prerelease=True]@oss/master")
+        self.requires("sisl/[^12.1, include_prerelease=True]@oss/master")
         self.requires("lz4/1.9.4", override=True)
 
     def validate(self):

src/include/homeobject/homeobject.hpp

@@ -6,20 +6,28 @@
 #include <string>
 
 #include "common.hpp"
+#include <sisl/utility/enum.hpp>
 
 namespace homeobject {
 
 class BlobManager;
 class PGManager;
 class ShardManager;
+ENUM(DevType, uint8_t, AUTO_DETECT = 1, HDD, NVME, UNSUPPORTED);
+struct device_info_t {
+    explicit device_info_t(std::string name, DevType dtype = DevType::AUTO_DETECT) : path{std::filesystem::canonical(name)}, type{dtype} {}
+    bool operator ==(device_info_t const& rhs) const { return path == rhs.path && type == rhs.type; }
+    std::filesystem::path path;
+    DevType type;
+};
 
 class HomeObjectApplication {
 public:
     virtual ~HomeObjectApplication() = default;
 
     virtual bool spdk_mode() const = 0;
     virtual uint32_t threads() const = 0;
-    virtual std::list< std::filesystem::path > devices() const = 0;
+    virtual std::list< device_info_t > devices() const = 0;
 
     // Callback made after determining if a SvcId exists or not during initialization, will consume response
     virtual peer_id_t discover_svcid(std::optional< peer_id_t > const& found) const = 0;

src/lib/homestore_backend/hs_homeobject.cpp

@@ -97,6 +97,13 @@ class HSReplApplication : public homestore::ReplApplication {
 //
 // This should assert if we can not initialize HomeStore.
 //
+DevType HSHomeObject::get_device_type(string const& devname) {
+    const iomgr::drive_type dtype = iomgr::DriveInterface::get_drive_type(devname);
+    if (dtype == iomgr::drive_type::block_hdd || dtype == iomgr::drive_type::file_on_hdd) { return DevType::HDD; }
+    if (dtype == iomgr::drive_type::file_on_nvme || dtype == iomgr::drive_type::block_nvme) { return DevType::NVME; }
+    return DevType::UNSUPPORTED;
+}
+
 void HSHomeObject::init_homestore() {
     auto app = _application.lock();
     RELEASE_ASSERT(app, "HomeObjectApplication lifetime unexpected!");
@@ -115,9 +122,27 @@ void HSHomeObject::init_homestore() {
     LOGI("Initialize and start HomeStore with app_mem_size = {}", homestore::in_bytes(app_mem_size));
 
     std::vector< homestore::dev_info > device_info;
-    for (auto const& path : app->devices()) {
-        device_info.emplace_back(std::filesystem::canonical(path).string(), homestore::HSDevType::Data);
+    bool has_data_dev = false;
+    bool has_fast_dev = false;
+    for (auto const& dev : app->devices()) {
+        auto input_dev_type = dev.type;
+        auto detected_type = get_device_type(dev.path.string());
+        LOGD("Device {} detected as {}", dev.path.string(), detected_type);
+        auto final_type = (dev.type == DevType::AUTO_DETECT) ? detected_type : input_dev_type;
+        if (final_type == DevType::UNSUPPORTED) {
+            LOGW("Device {} is not supported, skipping", dev.path.string());
+            continue;
+        }
+        if (input_dev_type != DevType::AUTO_DETECT && detected_type != final_type) {
+            LOGW("Device {} detected as {}, but input type is {}, using input type", dev.path.string(), detected_type,
+                 input_dev_type);
+        }
+        auto hs_type = (final_type == DevType::HDD) ? homestore::HSDevType::Data : homestore::HSDevType::Fast;
+        if (hs_type == homestore::HSDevType::Data) { has_data_dev = true; }
+        if (hs_type == homestore::HSDevType::Fast) { has_fast_dev = true; }
+        device_info.emplace_back(std::filesystem::canonical(dev.path).string(), hs_type);
     }
+    RELEASE_ASSERT(device_info.size() != 0, "No supported devices found!");
 
     chunk_selector_ = std::make_shared< HeapChunkSelector >();
     using namespace homestore;
@@ -134,17 +159,39 @@ void HSHomeObject::init_homestore() {
         RELEASE_ASSERT(!_our_id.is_nil(), "Received no SvcId and need FORMAT!");
         LOGW("We are starting for the first time on [{}], Formatting!!", to_string(_our_id));
 
-        HomeStore::instance()->format_and_start({
-            {HS_SERVICE::META, hs_format_params{.size_pct = 5.0}},
-            {HS_SERVICE::LOG, hs_format_params{.size_pct = 10.0, .chunk_size = 32 * Mi}},
-            {HS_SERVICE::REPLICATION,
-             hs_format_params{.size_pct = 79.0,
-                              .num_chunks = 65000,
-                              .block_size = _data_block_size,
-                              .alloc_type = blk_allocator_type_t::append,
-                              .chunk_sel_type = chunk_selector_type_t::CUSTOM}},
-            {HS_SERVICE::INDEX, hs_format_params{.size_pct = 5.0}},
-        });
+        if (has_data_dev && has_fast_dev) {
+            // Hybrid mode
+            LOGD("Has both Data and Fast, running with Hybrid mode");
+            HomeStore::instance()->format_and_start({
+                {HS_SERVICE::META, hs_format_params{.dev_type = HSDevType::Fast, .size_pct = 9.0, .num_chunks = 64}},
+                {HS_SERVICE::LOG,
+                 hs_format_params{.dev_type = HSDevType::Fast, .size_pct = 45.0, .chunk_size = 32 * Mi}},
+                {HS_SERVICE::INDEX, hs_format_params{.dev_type = HSDevType::Fast, .size_pct = 45.0, .num_chunks = 128}},
+                {HS_SERVICE::REPLICATION,
+                 hs_format_params{.dev_type = HSDevType::Data,
+                                  .size_pct = 99.0,
+                                  .num_chunks = 65000,
+                                  .block_size = _data_block_size,
+                                  .alloc_type = blk_allocator_type_t::append,
+                                  .chunk_sel_type = chunk_selector_type_t::CUSTOM}},
+            });
+        } else {
+            auto run_on_type = has_fast_dev ? homestore::HSDevType::Fast : homestore::HSDevType::Data;
+            LOGD("Running with Single mode, all service on {}", run_on_type);
+            HomeStore::instance()->format_and_start({
+	        // FIXME:  this is to work around the issue in HS that varsize allocator doesnt work with small chunk size.
+                {HS_SERVICE::META, hs_format_params{.dev_type = run_on_type, .size_pct = 5.0, .num_chunks = 1}},
+                {HS_SERVICE::LOG, hs_format_params{.dev_type = run_on_type, .size_pct = 10.0, .chunk_size = 32 * Mi}},
+                {HS_SERVICE::INDEX, hs_format_params{.dev_type = run_on_type, .size_pct = 5.0, .num_chunks = 1}},
+                {HS_SERVICE::REPLICATION,
+                 hs_format_params{.dev_type = run_on_type,
+                                  .size_pct = 79.0,
+                                  .num_chunks = 65000,
+                                  .block_size = _data_block_size,
+                                  .alloc_type = blk_allocator_type_t::append,
+                                  .chunk_sel_type = chunk_selector_type_t::CUSTOM}},
+            });
+        }
 
         // Create a superblock that contains our SvcId
         auto svc_sb = homestore::superblk< svc_info_superblk_t >(_svc_meta_name);

src/lib/homestore_backend/hs_homeobject.hpp

@@ -304,6 +304,9 @@ class HSHomeObject : public HomeObjectImpl {
 
     void persist_pg_sb();
 
+    // helpers
+    DevType get_device_type(string const& devname);
+
 public:
     using HomeObjectImpl::HomeObjectImpl;
     HSHomeObject();

src/lib/homestore_backend/tests/homeobj_fixture.hpp

@@ -32,7 +32,7 @@ class HomeObjectFixture : public ::testing::Test {
     std::default_random_engine rnd_engine{rnd()};
 
     void SetUp() override {
-        app = std::make_shared< FixtureApp >();
+        app = std::make_shared< FixtureApp >(true /* is_hybrid */);
         _obj_inst = homeobject::init_homeobject(std::weak_ptr< homeobject::HomeObjectApplication >(app));
     }
 

src/lib/tests/fixture_app.cpp

@@ -16,11 +16,17 @@ SISL_LOGGING_INIT(HOMEOBJECT_LOG_MODS)
 
 SISL_OPTIONS_ENABLE(logging, homeobject, test_home_object)
 
-FixtureApp::FixtureApp() {
+FixtureApp::FixtureApp(bool is_hybrid) : is_hybrid_(is_hybrid) {
     clean();
-    LOGWARN("creating device {} file with size {} ", path_, 10 * Gi);
-    std::ofstream ofs{path_, std::ios::binary | std::ios::out | std::ios::trunc};
-    std::filesystem::resize_file(path_, 10 * Gi);
+    LOGWARN("creating HDD device {} file with size {} ", path_hdd_, 10 * Gi);
+    std::ofstream ofs{path_hdd_, std::ios::binary | std::ios::out | std::ios::trunc};
+    std::filesystem::resize_file(path_hdd_, 10 * Gi);
+
+    if (is_hybrid_) {
+        LOGWARN("creating SSD device {} file with size {} ", path_ssd_, 10 * Gi);
+        std::ofstream ofs{path_ssd_, std::ios::binary | std::ios::out | std::ios::trunc};
+        std::filesystem::resize_file(path_ssd_, 10 * Gi);
+    }
 }
 
 homeobject::peer_id_t FixtureApp::discover_svcid(std::optional< homeobject::peer_id_t > const& p) const {

src/lib/tests/fixture_app.hpp

@@ -19,22 +19,30 @@ using homeobject::blob_id_t;
 using homeobject::peer_id_t;
 
 class FixtureApp : public homeobject::HomeObjectApplication {
-    std::string path_{"/tmp/homeobject_test.data"};
+    std::string path_hdd_{"/tmp/homeobject_test.hdd"};
+    std::string path_ssd_{"/tmp/homeobject_test.ssd"};
+    bool is_hybrid_{false};
 
 public:
-    FixtureApp();
+    FixtureApp(bool is_hybrid=false);
     ~FixtureApp() = default;
 
     bool spdk_mode() const override { return false; }
     uint32_t threads() const override { return 2; }
 
     void clean() {
-        if (std::filesystem::exists(path_)) std::filesystem::remove(path_);
+        if (std::filesystem::exists(path_hdd_)) std::filesystem::remove(path_hdd_);
+        if (std::filesystem::exists(path_ssd_)) std::filesystem::remove(path_ssd_);
     }
 
-    std::list< std::filesystem::path > devices() const override {
-        auto device_info = std::list< std::filesystem::path >();
-        device_info.emplace_back(std::filesystem::canonical(path_));
+    std::list< homeobject::device_info_t > devices() const override {
+        auto device_info = std::list< homeobject::device_info_t >();
+        // add HDD
+        device_info.emplace_back(path_hdd_, homeobject::DevType::HDD);
+        if (is_hybrid_) {
+            // add SSD
+            device_info.emplace_back(path_ssd_, homeobject::DevType::NVME);
+        }
         return device_info;
     }
 

test_package/test_package.cpp

@@ -11,7 +11,9 @@ class TestApp : public homeobject::HomeObjectApplication {
 public:
     bool spdk_mode() const override { return false; }
     uint32_t threads() const override { return 1; }
-    std::list< std::filesystem::path > devices() const override { return std::list< std::filesystem::path >(); }
+    std::list< homeobject::device_info_t > devices() const override {
+        return std::list< homeobject::device_info_t >();
+    }
     homeobject::peer_id_t discover_svcid(std::optional< homeobject::peer_id_t > const& p) const override {
         return boost::uuids::random_generator()();
     }