Fix device list for test_raft_repl_dev.

Previous code will add `ndevices` simulated drive into device list
which make each replica go with one real drive and ndevices simulated
drive.

Those simulated drives are identified as FAST, meta/log were on them.
Due to the very limited size of simulated drive, we can hit size limit
in long running test.

Fixing by honor input from hs_repl_test_common.

After this fix, if only one drive passed in for a replica of
test_raft_repl_dev,  that drive will be used as FAST. All services
will be started on that real drive.

Signed-off-by: Xiaoxi Chen <xiaoxchen@ebay.com>

Author: xiaoxichen

conanfile.py

@@ -5,7 +5,7 @@
 
 class HomestoreConan(ConanFile):
     name = "homestore"
-    version = "6.4.24"
+    version = "6.4.25"
     homepage = "https://github.com/eBay/Homestore"
     description = "HomeStore Storage Engine"
     topics = ("ebay", "nublox")

src/tests/test_common/homestore_test_common.hpp

@@ -181,10 +181,8 @@ class HSTestHelper {
         do_start_homestore(false /* fake_restart */, init_device);
     }
 
-
     virtual void restart_homestore(uint32_t shutdown_delay_sec = 5) {
         do_start_homestore(true /* fake_restart*/, false /* init_device */, shutdown_delay_sec);
-
     }
 
     virtual void shutdown_homestore(bool cleanup = true) {
@@ -346,6 +344,14 @@ class HSTestHelper {
             // Fake restart, device list is unchanged.
             shutdown_homestore(false);
             std::this_thread::sleep_for(std::chrono::seconds{shutdown_delay_sec});
+        } else if (!m_token.devs_.empty()) {
+            // For those UTs already process device list, like test_raft_repl_dev.
+            LOGINFO("Using passed in dev_list: {}",
+                    std::accumulate(m_token.devs_.begin(), m_token.devs_.end(), std::string(""),
+                                    [](const std::string& s, const homestore::dev_info& dinfo) {
+                                        return s.empty() ? dinfo.dev_name : s + "," + dinfo.dev_name;
+                                    }));
+
         } else if (SISL_OPTIONS.count("device_list")) {
             // User has provided explicit device list, use that and initialize them
             auto const devs = SISL_OPTIONS["device_list"].as< std::vector< std::string > >();
@@ -427,6 +433,9 @@ class HSTestHelper {
             set_min_chunk_size(m_token.svc_params_[HS_SERVICE::LOG].min_chunk_size);
         }
 
+        // in UT we assume first drive is FAST, rest are DATA.
+        bool has_data_drive = m_token.devs_.size() > 1;
+
         if (need_format) {
             auto svc_params = m_token.svc_params_;
             hsi->format_and_start(
@@ -446,7 +455,8 @@ class HSTestHelper {
                        : chunk_selector_type_t::ROUND_ROBIN}},
                  {HS_SERVICE::INDEX, {.size_pct = svc_params[HS_SERVICE::INDEX].size_pct}},
                  {HS_SERVICE::REPLICATION,
-                  {.size_pct = svc_params[HS_SERVICE::REPLICATION].size_pct,
+                  {.dev_type = has_data_drive ? homestore::HSDevType::Data : homestore::HSDevType::Fast,
+                   .size_pct = svc_params[HS_SERVICE::REPLICATION].size_pct,
                    .alloc_type = svc_params[HS_SERVICE::REPLICATION].blkalloc_type,
                    .chunk_sel_type = svc_params[HS_SERVICE::REPLICATION].custom_chunk_selector
                        ? chunk_selector_type_t::CUSTOM

src/tests/test_common/hs_repl_test_common.hpp

@@ -168,7 +168,8 @@ class HSReplTestHelper : public HSTestHelper {
                 }
             }
             for (auto const& dev : rdev_list[replica_num_]) {
-                dev_list_.emplace_back(dev, homestore::HSDevType::Data);
+                dev_list_.emplace_back(dev,
+                                       dev_list_.empty() ? homestore::HSDevType::Fast : homestore::HSDevType::Data);
             }
         }