seastore/cbjournal: remove start and end fields in cbjournal header

Signed-off-by: Myoungwon Oh <myoungwon.oh@samsung.com>

diff --git a/src/crimson/os/seastore/journal/circular_bounded_journal.cc b/src/crimson/os/seastore/journal/circular_bounded_journal.cc
index 92d597aebdc72a966406d3cf1373f904d6364423..68869c33ce246e190eca2a73a0cea4a8fa83987f 100644 (file)
--- a/src/crimson/os/seastore/journal/circular_bounded_journal.cc
+++ b/src/crimson/os/seastore/journal/circular_bounded_journal.cc
@@ -24,8 +24,6 @@ std::ostream &operator<<(std::ostream &out,
             << ", written_to=" << header.written_to
             << ", flsg=" << header.flag
             << ", header_checksum=" << header.header_checksum
-            << ", start=" << header.start
-            << ", end=" << header.end
              << ")";
 }
 
@@ -40,23 +38,17 @@ CircularBoundedJournal::mkfs(const mkfs_config_t& config)
   LOG_PREFIX(CircularBoundedJournal::mkfs);
   return _open_device(path
   ).safe_then([this, config, FNAME]() mutable -> mkfs_ret {
-    rbm_abs_addr start_addr = convert_paddr_to_abs_addr(
-      config.start);
     assert(static_cast<seastore_off_t>(config.block_size) ==
       device->get_block_size());
     ceph::bufferlist bl;
     CircularBoundedJournal::cbj_header_t head;
     head.block_size = config.block_size;
-    rbm_abs_addr end_addr = convert_paddr_to_abs_addr(
-      config.end);
-    head.size = end_addr - start_addr
-      - device->get_block_size();
+    head.size = config.total_size - device->get_block_size();
     head.start_offset = device->get_block_size();
     head.written_to = head.start_offset;
     head.applied_to = head.start_offset;
-    head.start = start_addr;
-    head.end = end_addr;
     head.device_id = config.device_id;
+    start_dev_addr = config.start;
     encode(head, bl);
     header = head;
     DEBUG(
@@ -142,14 +134,14 @@ CircularBoundedJournal::open_for_write(rbm_abs_addr start)
       open_for_write_ertr::pass_further{},
       crimson::ct_error::assert_all{
        "Invalid error read_header"
-    }).safe_then([this, FNAME](auto p) mutable {
+    }).safe_then([this, start, FNAME](auto p) mutable {
       auto &[head, bl] = *p;
       header = head;
       DEBUG("header : {}", header);
       paddr_t paddr = convert_abs_addr_to_paddr(
        get_written_to(),
        header.device_id);
-      header.size = header.end - header.start - get_block_size();
+      start_dev_addr = start;
       init = true;
       return open_for_write_ret(
        open_for_write_ertr::ready_future_marker{},
@@ -171,14 +163,14 @@ CircularBoundedJournal::write_ertr::future<> CircularBoundedJournal::append_reco
 {
   LOG_PREFIX(CircularBoundedJournal::append_record);
   std::vector<std::pair<rbm_abs_addr, bufferlist>> writes;
-  if (addr + bl.length() <= header.end) {
+  if (addr + bl.length() <= get_journal_end()) {
     writes.push_back(std::make_pair(addr, bl));
   } else {
     // write remaining data---in this case,
     // data is splited into two parts before due to the end of CircularBoundedJournal.
     // the following code is to write the second part
     bufferlist first_write, next_write;
-    first_write.substr_of(bl, 0, header.end - addr);
+    first_write.substr_of(bl, 0, get_journal_end() - addr);
     writes.push_back(std::make_pair(addr, first_write));
     next_write.substr_of(
       bl, first_write.length(), bl.length() - first_write.length());
@@ -218,7 +210,7 @@ CircularBoundedJournal::submit_record_ret CircularBoundedJournal::submit_record(
   auto r_size = record_group_size_t(record.size, get_block_size());
   auto encoded_size = r_size.get_encoded_length();
   if (get_written_to() +
-      ceph::encoded_sizeof_bounded<record_group_header_t>() > header.end) {
+      ceph::encoded_sizeof_bounded<record_group_header_t>() > get_journal_end()) {
     // not enough space between written_to and the end of journal,
     // so that update used size to increase the amount of the remaing space
     // |        cbjournal      |
@@ -244,9 +236,9 @@ CircularBoundedJournal::submit_record_ret CircularBoundedJournal::submit_record(
     std::move(record), device->get_block_size(),
     j_seq, 0);
   auto target = get_written_to();
-  if (get_written_to() + to_write.length() >= header.end) {
+  if (get_written_to() + to_write.length() >= get_journal_end()) {
     set_written_to(get_start_addr() +
-      (to_write.length() - (header.end - get_written_to())));
+      (to_write.length() - (get_journal_end() - get_written_to())));
   } else {
     set_written_to(get_written_to() + to_write.length());
   }
@@ -297,7 +289,7 @@ CircularBoundedJournal::write_ertr::future<> CircularBoundedJournal::device_writ
 {
   LOG_PREFIX(CircularBoundedJournal::device_write_bl);
   auto length = bl.length();
-  if (offset + length > header.end) {
+  if (offset + length > get_journal_end()) {
     return crimson::ct_error::erange::make();
   }
   bl.rebuild_aligned(get_block_size());
@@ -432,11 +424,11 @@ Journal::replay_ret CircularBoundedJournal::replay(
                  );
              });
            }).safe_then([this, &cursor_addr]() {
-             if (cursor_addr >= header.end) {
-               cursor_addr = (cursor_addr - header.end) + get_start_addr();
+             if (cursor_addr >= get_journal_end()) {
+               cursor_addr = (cursor_addr - get_journal_end()) + get_start_addr();
              }
              if (get_written_to() +
-                 ceph::encoded_sizeof_bounded<record_group_header_t>() > header.end) {
+                 ceph::encoded_sizeof_bounded<record_group_header_t>() > get_journal_end()) {
                cursor_addr = get_start_addr();
              }
              return replay_ertr::make_ready_future<
@@ -476,9 +468,9 @@ CircularBoundedJournal::read_record_ret CircularBoundedJournal::read_record(padd
     off);
   rbm_abs_addr addr = offset;
   auto read_length = get_block_size();
-  if (addr + get_block_size() > header.end) {
+  if (addr + get_block_size() > get_journal_end()) {
     addr = get_start_addr();
-    read_length = header.end - offset;
+    read_length = get_journal_end() - offset;
   }
   DEBUG("read_record: reading record from abs addr {} read length {}",
       addr, read_length);
@@ -517,11 +509,11 @@ CircularBoundedJournal::read_record_ret CircularBoundedJournal::read_record(padd
       auto next_read = h.mdlength + h.dlength - read_length;
       DEBUG(" next_read_addr {}, next_read_length {} ",
          next_read_addr, next_read);
-      if (header.end < next_read_addr + next_read) {
+      if (get_journal_end() < next_read_addr + next_read) {
        // In this case, need two more reads.
        // The first is to read remain bytes to the end of cbjournal
        // The second is to read the data at the begining of cbjournal
-       next_read = header.end - (addr + read_length);
+       next_read = get_journal_end() - (addr + read_length);
       }
       DEBUG("read_entry: additional reading addr {} length {}",
            next_read_addr,
@@ -576,7 +568,7 @@ CircularBoundedJournal::write_header()
   DEBUG(
     "sync header of CircularBoundedJournal, length {}",
     bl.length());
-  return device_write_bl(header.start, bl);
+  return device_write_bl(start_dev_addr, bl);
 }
 
 }

diff --git a/src/crimson/os/seastore/journal/circular_bounded_journal.h b/src/crimson/os/seastore/journal/circular_bounded_journal.h
index 6c06cad581e0dbadcc5cf4ec63e630d07bfb3e1b..a8292e556743d77f2a2f68f5e182fb51570fa64d 100644 (file)
--- a/src/crimson/os/seastore/journal/circular_bounded_journal.h
+++ b/src/crimson/os/seastore/journal/circular_bounded_journal.h
@@ -61,8 +61,7 @@ class CircularBoundedJournal : public Journal {
 public:
   struct mkfs_config_t {
     std::string path;
-    paddr_t start;
-    paddr_t end;
+    rbm_abs_addr start = 0;
     size_t block_size = 0;
     size_t total_size = 0;
     device_id_t device_id = 0;
@@ -71,8 +70,7 @@ public:
       device_id_t d_id = 1 << (std::numeric_limits<device_id_t>::digits - 1);
       return mkfs_config_t {
        "",
-       paddr_t::make_blk_paddr(d_id, 0),
-       paddr_t::make_blk_paddr(d_id, DEFAULT_SIZE),
+       0,
        DEFAULT_BLOCK_SIZE,
        DEFAULT_SIZE,
        d_id,
@@ -220,8 +218,6 @@ public:
     uint64_t flag = 0;       // represent features (reserved)
     checksum_t header_checksum = 0;       // checksum of entire cbj_header_t
 
-    rbm_abs_addr start = 0; // start address of CircularBoundedJournal
-    rbm_abs_addr end = 0;   // start address of CircularBoundedJournal
     device_id_t device_id;
 
     DENC(cbj_header_t, v, p) {
@@ -229,6 +225,7 @@ public:
       denc(v.magic, p);
       denc(v.uuid, p);
       denc(v.block_size, p);
+      denc(v.size, p);
 
       denc(v.start_offset, p);
 
@@ -237,8 +234,6 @@ public:
 
       denc(v.flag, p);
       denc(v.header_checksum, p);
-      denc(v.start, p);
-      denc(v.end, p);
       denc(v.device_id, p);
 
       DENC_FINISH(p);
@@ -301,6 +296,9 @@ public:
   size_t get_block_size() const {
     return header.block_size;
   }
+  rbm_abs_addr get_journal_end() const {
+    return header.size + get_block_size(); // journal size + header length
+  }
   void add_device(NVMeBlockDevice* dev) {
     device = dev;
   }
@@ -311,6 +309,7 @@ private:
   WritePipeline *write_pipeline = nullptr;
   bool init = false;
   segment_seq_t cur_segment_seq = 0; // segment seq to track the sequence to written records
+  rbm_abs_addr start_dev_addr = 0; // cbjournal start address in device
 };
 
 std::ostream &operator<<(std::ostream &out, const CircularBoundedJournal::cbj_header_t &header);

diff --git a/src/test/crimson/seastore/test_cbjournal.cc b/src/test/crimson/seastore/test_cbjournal.cc
index 6b38eae71d748655e316fc3bed29e04a181af220..e7fbf4129687ba9f3f4233269c4e86d4cfb3e1c2 100644 (file)
--- a/src/test/crimson/seastore/test_cbjournal.cc
+++ b/src/test/crimson/seastore/test_cbjournal.cc
@@ -141,8 +141,7 @@ struct cbjournal_test_t : public seastar_test_suite_t
     device = new nvme_device::TestMemory(CBTEST_DEFAULT_TEST_SIZE);
     cbj.reset(new CircularBoundedJournal(device, std::string()));
     device_id_t d_id = 1 << (std::numeric_limits<device_id_t>::digits - 1);
-    config.start = paddr_t::make_blk_paddr(d_id, 0);
-    config.end = paddr_t::make_blk_paddr(d_id, CBTEST_DEFAULT_TEST_SIZE);
+    config.start = 0;
     config.block_size = CBTEST_DEFAULT_BLOCK_SIZE;
     config.total_size = CBTEST_DEFAULT_TEST_SIZE;
     config.device_id = d_id;
@@ -235,9 +234,7 @@ struct cbjournal_test_t : public seastar_test_suite_t
     return cbj->mkfs(config).unsafe_get0();
   }
   auto open() {
-    rbm_abs_addr addr = convert_paddr_to_abs_addr(
-      config.start);
-    return cbj->open_for_write(addr).unsafe_get0();
+    return cbj->open_for_write(config.start).unsafe_get0();
   }
   auto get_available_size() {
     return cbj->get_available_size();
@@ -404,8 +401,6 @@ TEST_F(cbjournal_test_t, update_header)
 
     ASSERT_EQ(update_header.applied_to, update_header.applied_to);
     ASSERT_EQ(header.block_size, update_header.block_size);
-    ASSERT_EQ(header.start, update_header.start);
-    ASSERT_EQ(header.end, update_header.end);
     ASSERT_EQ(header.size, update_header.size);
     ASSERT_EQ(header.written_to + record_total_size, update_header.written_to);
   });