crimson/os/seastore: rename about device_type_t and journal_type_t

Signed-off-by: Zhang Song <zhangsong325@gmail.com>

diff --git a/src/crimson/os/seastore/async_cleaner.cc b/src/crimson/os/seastore/async_cleaner.cc
index ecc8d0be7fa0d65376354eed6ea4cda6e63b2b52..613c7bd63b2e13851853b491c9a1a795826421d3 100644 (file)
--- a/src/crimson/os/seastore/async_cleaner.cc
+++ b/src/crimson/os/seastore/async_cleaner.cc
@@ -359,7 +359,7 @@ JournalTrimmerImpl::config_t::get_default(
     target_alloc_bytes = 2 * roll_size;
     max_journal_bytes = 16 * roll_size;
   } else {
-    assert(type == journal_type_t::CIRCULAR);
+    assert(type == journal_type_t::RANDOM_BLOCK);
     target_dirty_bytes = roll_size / 4;
     target_alloc_bytes = roll_size / 4;
     max_journal_bytes = roll_size / 2;
@@ -386,7 +386,7 @@ JournalTrimmerImpl::config_t::get_test(
     target_alloc_bytes = 2 * roll_size;
     max_journal_bytes = 4 * roll_size;
   } else {
-    assert(type == journal_type_t::CIRCULAR);
+    assert(type == journal_type_t::RANDOM_BLOCK);
     target_dirty_bytes = roll_size / 4;
     target_alloc_bytes = roll_size / 4;
     max_journal_bytes = roll_size / 2;

diff --git a/src/crimson/os/seastore/cache.cc b/src/crimson/os/seastore/cache.cc
index d29d5d8b0324ba5bab15b2bf32de396130b31552..1d329ed582acbdf11683684d3da0465e767c2cc0 100644 (file)
--- a/src/crimson/os/seastore/cache.cc
+++ b/src/crimson/os/seastore/cache.cc
@@ -1766,7 +1766,7 @@ Cache::replay_delta(
         ERROR("identified delta crc {} doesn't match the extent at {} {}, "
               "probably is out-dated -- {}",
               delta, journal_seq, record_base, *extent);
-        ceph_assert(epm.get_journal_type() == journal_type_t::CIRCULAR);
+        ceph_assert(epm.get_journal_type() == journal_type_t::RANDOM_BLOCK);
         remove_extent(extent);
         return replay_delta_ertr::make_ready_future<bool>(false);
       }

diff --git a/src/crimson/os/seastore/extent_placement_manager.cc b/src/crimson/os/seastore/extent_placement_manager.cc
index e9cba6eead268ac177e9e5952df7a4beb9c68dc4..27a882dca8cc2b1dda5c32b32d8b670ae45a558a 100644 (file)
--- a/src/crimson/os/seastore/extent_placement_manager.cc
+++ b/src/crimson/os/seastore/extent_placement_manager.cc
@@ -210,12 +210,12 @@ void ExtentPlacementManager::set_primary_device(Device *device)
 {
   ceph_assert(primary_device == nullptr);
   primary_device = device;
-  if (device->get_device_type() == device_type_t::SEGMENTED) {
+  if (device->get_device_type() == device_type_t::SSD) {
     prefer_ool = false;
     ceph_assert(devices_by_id[device->get_device_id()] == device);
   } else {
     // RBM device is not in the cleaner.
-    ceph_assert(device->get_device_type() == device_type_t::RANDOM_BLOCK);
+    ceph_assert(device->get_device_type() == device_type_t::RANDOM_BLOCK_SSD);
     prefer_ool = true;
     add_device(primary_device);
   }

diff --git a/src/crimson/os/seastore/extent_placement_manager.h b/src/crimson/os/seastore/extent_placement_manager.h
index 98cfc76f7ebb6f5cec1a62a1b6a6127e635845b5..d8ff09a11468177aa96d48c6fbde111f9c331480 100644 (file)
--- a/src/crimson/os/seastore/extent_placement_manager.h
+++ b/src/crimson/os/seastore/extent_placement_manager.h
@@ -236,7 +236,7 @@ public:
   // Testing interfaces
 
   void test_init_no_background(Device *test_device) {
-    assert(test_device->get_device_type() == device_type_t::SEGMENTED);
+    assert(test_device->get_device_type() == device_type_t::SSD);
     add_device(test_device);
     set_primary_device(test_device);
   }

diff --git a/src/crimson/os/seastore/journal/circular_bounded_journal.h b/src/crimson/os/seastore/journal/circular_bounded_journal.h
index 3c777883b742d39812e6a8ff9543544555aaabdb..7276a133df907da450e68ff64a2367005d478655 100644 (file)
--- a/src/crimson/os/seastore/journal/circular_bounded_journal.h
+++ b/src/crimson/os/seastore/journal/circular_bounded_journal.h
@@ -91,7 +91,7 @@ public:
   close_ertr::future<> close() final;
 
   journal_type_t get_type() final {
-    return journal_type_t::CIRCULAR;
+    return journal_type_t::RANDOM_BLOCK;
   }
 
   submit_record_ret submit_record(

diff --git a/src/crimson/os/seastore/random_block_manager/rbm_device.h b/src/crimson/os/seastore/random_block_manager/rbm_device.h
index 050e14542da4299d279e3f7adda7cd0b6a88212a..5ec9266b4a1f71ae7d84230aefdedf80a0aa53c8 100644 (file)
--- a/src/crimson/os/seastore/random_block_manager/rbm_device.h
+++ b/src/crimson/os/seastore/random_block_manager/rbm_device.h
@@ -105,7 +105,7 @@ public:
   }
 
   device_type_t get_device_type() const final {
-    return device_type_t::RANDOM_BLOCK;
+    return device_type_t::RANDOM_BLOCK_SSD;
   }
 
   const seastore_meta_t &get_meta() const final {

diff --git a/src/crimson/os/seastore/seastore.cc b/src/crimson/os/seastore/seastore.cc
index 079b17713f767671a78be63150dfe3b269331ac8..0c9514e665a4b6a5526a82b933ea82345ee80160 100644 (file)
--- a/src/crimson/os/seastore/seastore.cc
+++ b/src/crimson/os/seastore/seastore.cc
@@ -315,7 +315,7 @@ SeaStore::mkfs_ertr::future<> SeaStore::mkfs(uuid_d new_osd_fsid)
               true,
               device_spec_t{
                 (magic_t)std::rand(),
-                device_type_t::SEGMENTED,
+                device_type_t::SSD,
                 0},
               seastore_meta_t{new_osd_fsid},
               sds}

diff --git a/src/crimson/os/seastore/seastore_types.cc b/src/crimson/os/seastore/seastore_types.cc
index 7464eed7895ef6390fe5df58cfabd58ad1e86fed..65ebf5988650a4237d9b7cf64bbf2078c84e775e 100644 (file)
--- a/src/crimson/os/seastore/seastore_types.cc
+++ b/src/crimson/os/seastore/seastore_types.cc
@@ -145,7 +145,7 @@ journal_seq_t journal_seq_t::add_offset(
   if (type == journal_type_t::SEGMENTED) {
     joff = offset.as_seg_paddr().get_segment_off();
   } else {
-    assert(type == journal_type_t::CIRCULAR);
+    assert(type == journal_type_t::RANDOM_BLOCK);
     auto boff = offset.as_blk_paddr().get_block_off();
     assert(boff <= MAX_SEG_OFF);
     joff = boff;
@@ -196,7 +196,7 @@ seastore_off_t journal_seq_t::relative_to(
     ret += (static_cast<int64_t>(offset.as_seg_paddr().get_segment_off()) -
             static_cast<int64_t>(r.offset.as_seg_paddr().get_segment_off()));
   } else {
-    assert(type == journal_type_t::CIRCULAR);
+    assert(type == journal_type_t::RANDOM_BLOCK);
     ret += (static_cast<int64_t>(offset.as_blk_paddr().get_block_off()) -
             static_cast<int64_t>(r.offset.as_blk_paddr().get_block_off()));
   }

diff --git a/src/crimson/os/seastore/segment_manager.h b/src/crimson/os/seastore/segment_manager.h
index e313b2b1a643658ba44a194ed797d3804fc3efb6..365e09d2089488ea00b796cdef974140b1c7b7d1 100644 (file)
--- a/src/crimson/os/seastore/segment_manager.h
+++ b/src/crimson/os/seastore/segment_manager.h
@@ -55,7 +55,7 @@ struct block_sm_superblock_t {
     ceph_assert(first_segment_offset > tracker_offset &&
                 first_segment_offset % block_size == 0);
     ceph_assert(config.spec.magic != 0);
-    ceph_assert(config.spec.dtype == device_type_t::SEGMENTED);
+    ceph_assert(config.spec.dtype == device_type_t::SSD);
     ceph_assert(config.spec.id <= DEVICE_ID_MAX_VALID);
     if (!config.major_dev) {
       ceph_assert(config.secondary_devices.size() == 0);
@@ -152,7 +152,7 @@ using SegmentManagerRef = std::unique_ptr<SegmentManager>;
 class SegmentManager : public Device {
 public:
   device_type_t get_device_type() const final {
-    return device_type_t::SEGMENTED;
+    return device_type_t::SSD;
   }
 
   using open_ertr = crimson::errorator<

diff --git a/src/crimson/os/seastore/segment_manager/ephemeral.cc b/src/crimson/os/seastore/segment_manager/ephemeral.cc
index 6a97a5130336933bc32c826eb22d85d4bd30d274..7c2f5759926d0a691da0a008f0fd371920b88f6e 100644 (file)
--- a/src/crimson/os/seastore/segment_manager/ephemeral.cc
+++ b/src/crimson/os/seastore/segment_manager/ephemeral.cc
@@ -34,7 +34,7 @@ device_config_t get_ephemeral_device_config(
 {
   assert(num_devices > index);
   magic_t magic = 0xabcd;
-  auto type = device_type_t::SEGMENTED;
+  auto type = device_type_t::SEGMENTED_EPHEMERAL;
   bool is_major_device;
   secondary_device_set_t secondary_devices;
   if (index == 0) {

diff --git a/src/crimson/os/seastore/transaction_manager.cc b/src/crimson/os/seastore/transaction_manager.cc
index dfa0588f86a33786c50ab2e7ab7c4c0dd4b75c94..b18836c2e8e848fea6beb3dbe18439c11fb1f136 100644 (file)
--- a/src/crimson/os/seastore/transaction_manager.cc
+++ b/src/crimson/os/seastore/transaction_manager.cc
@@ -631,19 +631,19 @@ TransactionManagerRef make_transaction_manager(
   auto backref_manager = create_backref_manager(*cache);
 
   auto p_device_type = primary_device->get_device_type();
-  ceph_assert(p_device_type == device_type_t::SEGMENTED ||
-              p_device_type == device_type_t::RANDOM_BLOCK);
+  ceph_assert(p_device_type == device_type_t::SSD ||
+              p_device_type == device_type_t::RANDOM_BLOCK_SSD);
 
-  if (p_device_type == device_type_t::SEGMENTED) {
+  if (p_device_type == device_type_t::SSD) {
     sms->add_segment_manager(static_cast<SegmentManager*>(primary_device));
   }
   for (auto &p_dev : secondary_devices) {
-    ceph_assert(p_dev->get_device_type() == device_type_t::SEGMENTED);
+    ceph_assert(p_dev->get_device_type() == device_type_t::SSD);
     sms->add_segment_manager(static_cast<SegmentManager*>(p_dev));
   }
 
-  auto journal_type = (p_device_type == device_type_t::SEGMENTED ?
-                       journal_type_t::SEGMENTED : journal_type_t::CIRCULAR);
+  auto journal_type = (p_device_type == device_type_t::SSD ?
+                       journal_type_t::SEGMENTED : journal_type_t::RANDOM_BLOCK);
   seastore_off_t roll_size;
   seastore_off_t roll_start;
   if (journal_type == journal_type_t::SEGMENTED) {

diff --git a/src/crimson/tools/store_nbd/tm_driver.cc b/src/crimson/tools/store_nbd/tm_driver.cc
index 56cafc32b96bb6c193ddf3ab0f8ef06b24a79952..060016822f271995f1620f46caf60c6303fac237 100644 (file)
--- a/src/crimson/tools/store_nbd/tm_driver.cc
+++ b/src/crimson/tools/store_nbd/tm_driver.cc
@@ -162,7 +162,7 @@ seastar::future<> TMDriver::mkfs()
       device_config_t{
         true,
         (magic_t)std::rand(),
-        device_type_t::SEGMENTED,
+        device_type_t::SSD,
         0,
         meta,
         secondary_device_set_t()});

diff --git a/src/test/crimson/seastore/test_transaction_manager.cc b/src/test/crimson/seastore/test_transaction_manager.cc
index 6b79835616f465e364a24ee7eb85f21a3ed04d01..c0306db4409b61b9db4ff4a21d3d61b7643e970b 100644 (file)
--- a/src/test/crimson/seastore/test_transaction_manager.cc
+++ b/src/test/crimson/seastore/test_transaction_manager.cc
@@ -76,7 +76,7 @@ struct transaction_manager_test_t :
     if (j_type == "segmented") {
       return tm_setup(journal_type_t::SEGMENTED);
     } else if (j_type == "circularbounded") {
-      return tm_setup(journal_type_t::CIRCULAR);
+      return tm_setup(journal_type_t::RANDOM_BLOCK);
     } else {
       ceph_assert(0 == "no support");
     }

diff --git a/src/test/crimson/seastore/transaction_manager_test_state.h b/src/test/crimson/seastore/transaction_manager_test_state.h
index 64559c45693c86caca4d1f7eae385fe63e573fb8..73adbcfab475db347ee3379ddd988c1309a20080 100644 (file)
--- a/src/test/crimson/seastore/transaction_manager_test_state.h
+++ b/src/test/crimson/seastore/transaction_manager_test_state.h
@@ -136,7 +136,7 @@ protected:
     if (journal_type == journal_type_t::SEGMENTED) {
       return segment_setup();
     } else {
-      assert(journal_type == journal_type_t::CIRCULAR);
+      assert(journal_type == journal_type_t::RANDOM_BLOCK);
       return randomblock_setup();
     }
   }
@@ -172,7 +172,7 @@ protected:
     for (auto &sec_sm : secondary_segment_managers) {
       sec_devices.emplace_back(sec_sm.get());
     }
-    if (journal_type == journal_type_t::CIRCULAR) {
+    if (journal_type == journal_type_t::RANDOM_BLOCK) {
       // FIXME: should not initialize segment_manager with circularbounded-journal
       // FIXME: no secondary device in the single device test
       sec_devices.emplace_back(segment_manager.get());