crimson/os/seastore: rename segment_header_t::journal_segment_seq to segment_seq

Signed-off-by: Xuehan Xu <xxhdx1985126@gmail.com>

diff --git a/src/crimson/os/seastore/journal/segmented_journal.cc b/src/crimson/os/seastore/journal/segmented_journal.cc
index 8d8c25b6884cc1228572791e555858af5d8eded1..ddd9c3d2513515d8316c2e31178d4d9c0e14dd8c 100644 (file)
--- a/src/crimson/os/seastore/journal/segmented_journal.cc
+++ b/src/crimson/os/seastore/journal/segmented_journal.cc
@@ -76,12 +76,12 @@ SegmentedJournal::prep_replay_segments(
     segments.begin(),
     segments.end(),
     [](const auto &lt, const auto &rt) {
-      return lt.second.journal_segment_seq <
-       rt.second.journal_segment_seq;
+      return lt.second.segment_seq <
+       rt.second.segment_seq;
     });
 
   segment_seq_allocator->set_next_segment_seq(
-    segments.rbegin()->second.journal_segment_seq + 1);
+    segments.rbegin()->second.segment_seq + 1);
   std::for_each(
     segments.begin(),
     segments.end(),
@@ -107,7 +107,7 @@ SegmentedJournal::prep_replay_segments(
        auto& seg_addr = replay_from.as_seg_paddr();
        return seg.first == seg_addr.get_segment_id();
       });
-    if (from->second.journal_segment_seq != journal_tail.segment_seq) {
+    if (from->second.segment_seq != journal_tail.segment_seq) {
       ERROR("journal_tail {} does not match {}",
             journal_tail, from->second);
       ceph_abort();
@@ -126,7 +126,7 @@ SegmentedJournal::prep_replay_segments(
     from, segments.end(), ret.begin(),
     [this](const auto &p) {
       auto ret = journal_seq_t{
-       p.second.journal_segment_seq,
+       p.second.segment_seq,
        paddr_t::make_seg_paddr(
          p.first,
          journal_segment_allocator.get_block_size())

diff --git a/src/crimson/os/seastore/seastore_types.cc b/src/crimson/os/seastore/seastore_types.cc
index 8a3748cc8f25ff1e7f4dabd3fbdc85db63c032f2..a52ccfc590975e27b1c715c5e4ff66fc9b187e81 100644 (file)
--- a/src/crimson/os/seastore/seastore_types.cc
+++ b/src/crimson/os/seastore/seastore_types.cc
@@ -214,7 +214,7 @@ std::ostream &operator<<(std::ostream &out, const extent_info_t &info)
 std::ostream &operator<<(std::ostream &out, const segment_header_t &header)
 {
   return out << "segment_header_t("
-            << "segment_seq=" << segment_seq_printer_t{header.journal_segment_seq}
+            << "segment_seq=" << segment_seq_printer_t{header.segment_seq}
             << ", segment_id=" << header.physical_segment_id
             << ", journal_tail=" << header.journal_tail
             << ", segment_nonce=" << header.segment_nonce
@@ -225,7 +225,7 @@ std::ostream &operator<<(std::ostream &out, const segment_header_t &header)
 std::ostream &operator<<(std::ostream &out, const segment_tail_t &tail)
 {
   return out << "segment_tail_t("
-            << "segment_seq=" << tail.journal_segment_seq
+            << "segment_seq=" << tail.segment_seq
             << ", segment_id=" << tail.physical_segment_id
             << ", journal_tail=" << tail.journal_tail
             << ", segment_nonce=" << tail.segment_nonce

diff --git a/src/crimson/os/seastore/seastore_types.h b/src/crimson/os/seastore/seastore_types.h
index 426ef043691d59f9c6e8b8321773c9fcac205737..3afbf6571e4e5e48e69c3fded814b9e0039687ba 100644 (file)
--- a/src/crimson/os/seastore/seastore_types.h
+++ b/src/crimson/os/seastore/seastore_types.h
@@ -1290,7 +1290,7 @@ using segment_nonce_t = uint32_t;
  * 2) Replay starting at record located at that segment's journal_tail
  */
 struct segment_header_t {
-  segment_seq_t journal_segment_seq;
+  segment_seq_t segment_seq;
   segment_id_t physical_segment_id; // debugging
 
   journal_seq_t journal_tail;
@@ -1304,7 +1304,7 @@ struct segment_header_t {
 
   DENC(segment_header_t, v, p) {
     DENC_START(1, 1, p);
-    denc(v.journal_segment_seq, p);
+    denc(v.segment_seq, p);
     denc(v.physical_segment_id, p);
     denc(v.journal_tail, p);
     denc(v.segment_nonce, p);
@@ -1315,7 +1315,7 @@ struct segment_header_t {
 std::ostream &operator<<(std::ostream &out, const segment_header_t &header);
 
 struct segment_tail_t {
-  segment_seq_t journal_segment_seq;
+  segment_seq_t segment_seq;
   segment_id_t physical_segment_id; // debugging
 
   journal_seq_t journal_tail;
@@ -1332,7 +1332,7 @@ struct segment_tail_t {
 
   DENC(segment_tail_t, v, p) {
     DENC_START(1, 1, p);
-    denc(v.journal_segment_seq, p);
+    denc(v.segment_seq, p);
     denc(v.physical_segment_id, p);
     denc(v.journal_tail, p);
     denc(v.segment_nonce, p);

diff --git a/src/crimson/os/seastore/segment_cleaner.cc b/src/crimson/os/seastore/segment_cleaner.cc
index df4f76ff5fd4c10d29d3f74e7136ee5c0ea956b7..48f7b464fc8cfb07c45e75128d24a8f18f3e0822 100644 (file)
--- a/src/crimson/os/seastore/segment_cleaner.cc
+++ b/src/crimson/os/seastore/segment_cleaner.cc
@@ -575,7 +575,7 @@ SegmentCleaner::mount_ret SegmentCleaner::mount(
            }
            init_mark_segment_closed(
              segment_id,
-             header.journal_segment_seq,
+             header.segment_seq,
              header.type);
            return seastar::now();
          }).handle_error(
@@ -662,7 +662,7 @@ SegmentCleaner::scan_extents_ret SegmentCleaner::scan_nonfull_segment(
     }).safe_then([this, segment_id, header](auto) {
       init_mark_segment_closed(
        segment_id,
-       header.journal_segment_seq,
+       header.segment_seq,
        header.type);
       return seastar::now();
     });
@@ -676,7 +676,7 @@ SegmentCleaner::scan_extents_ret SegmentCleaner::scan_nonfull_segment(
   }
   init_mark_segment_closed(
     segment_id,
-    header.journal_segment_seq,
+    header.segment_seq,
     header.type);
   return seastar::now();
 }