From 35de684fc9b1f70a661e8f2f536589afb9ae8943 Mon Sep 17 00:00:00 2001 From: myoungwon oh Date: Fri, 6 May 2022 15:42:39 +0900 Subject: [PATCH] seastore/cbjournal: remove used_size in header Signed-off-by: Myoungwon Oh --- .../seastore/journal/circular_bounded_journal.cc | 4 ---- .../seastore/journal/circular_bounded_journal.h | 15 ++++----------- src/test/crimson/seastore/test_cbjournal.cc | 5 ----- 3 files changed, 4 insertions(+), 20 deletions(-) diff --git a/src/crimson/os/seastore/journal/circular_bounded_journal.cc b/src/crimson/os/seastore/journal/circular_bounded_journal.cc index d097ed94692..f0059f9a4cc 100644 --- a/src/crimson/os/seastore/journal/circular_bounded_journal.cc +++ b/src/crimson/os/seastore/journal/circular_bounded_journal.cc @@ -19,7 +19,6 @@ std::ostream &operator<<(std::ostream &out, << ", uuid=" << header.uuid << ", block_size=" << header.block_size << ", size=" << header.size - << ", used_size=" << header.used_size << ", error=" << header.error << ", start_offset=" << header.start_offset << ", applied_to="<< header.applied_to @@ -226,7 +225,6 @@ CircularBoundedJournal::submit_record_ret CircularBoundedJournal::submit_record( // | cbjournal | // v v // written_to <-> the end of journal - set_used_size(get_used_size() + (header.end - get_written_to())); set_written_to(get_start_addr()); } if (encoded_size > get_available_size()) { @@ -284,7 +282,6 @@ CircularBoundedJournal::submit_record_ret CircularBoundedJournal::submit_record( "append_record: commit target {} used_size {} written length {}", target, get_used_size(), length); - set_used_size(get_used_size() + length); paddr_t paddr = convert_abs_addr_to_paddr( target + r_size.get_mdlength(), header.device_id); @@ -404,7 +401,6 @@ Journal::replay_ret CircularBoundedJournal::replay( cursor_addr += bl.length(); set_written_to(cursor_addr); last_seq = r_header.committed_to.segment_seq; - set_used_size(get_used_size() + bl.length()); return seastar::do_with( std::move(*maybe_record_deltas_list), [write_result, diff --git a/src/crimson/os/seastore/journal/circular_bounded_journal.h b/src/crimson/os/seastore/journal/circular_bounded_journal.h index 0cc34915220..96585aca81d 100644 --- a/src/crimson/os/seastore/journal/circular_bounded_journal.h +++ b/src/crimson/os/seastore/journal/circular_bounded_journal.h @@ -209,7 +209,6 @@ public: uuid_d uuid; uint64_t block_size = 0; // aligned with block_size uint64_t size = 0; // max length of journal - uint64_t used_size = 0; // current used_size of journal uint32_t error = 0; // reserved // start offset of CircularBoundedJournal in the device (start + header length) @@ -260,10 +259,9 @@ public: */ size_t get_used_size() const { - return header.used_size; - } - void set_used_size(size_t size) { - header.used_size = size; + return get_written_to() >= get_applied_to() ? + get_written_to() - get_applied_to() : + get_written_to() + get_total_size() - get_applied_to(); } size_t get_total_size() const { return header.size; @@ -276,12 +274,7 @@ public: } void update_applied_to(rbm_abs_addr addr, uint32_t len) { - rbm_abs_addr new_applied_to = addr; - set_used_size( - get_written_to() >= new_applied_to ? - get_written_to() - (new_applied_to + len) : - get_written_to() + get_total_size() - (new_applied_to + len)); - set_applied_to(new_applied_to + len); + set_applied_to(addr + len); } write_ertr::future<> write_header(); diff --git a/src/test/crimson/seastore/test_cbjournal.cc b/src/test/crimson/seastore/test_cbjournal.cc index d66ec2cbcbd..eba3246151e 100644 --- a/src/test/crimson/seastore/test_cbjournal.cc +++ b/src/test/crimson/seastore/test_cbjournal.cc @@ -260,9 +260,6 @@ struct cbjournal_test_t : public seastar_test_suite_t void set_written_to(rbm_abs_addr addr) { cbj->set_written_to(addr); } - void set_used_size(size_t size) { - cbj->set_used_size(size); - } }; TEST_F(cbjournal_test_t, submit_one_record) @@ -407,7 +404,6 @@ TEST_F(cbjournal_test_t, update_header) ASSERT_EQ(header.start, update_header.start); ASSERT_EQ(header.end, update_header.end); ASSERT_EQ(header.size, update_header.size); - ASSERT_EQ(header.used_size, update_header.used_size); ASSERT_EQ(header.written_to + record_total_size, update_header.written_to); }); } @@ -469,7 +465,6 @@ TEST_F(cbjournal_test_t, replay_after_reset) auto old_written_to = get_written_to(); auto old_used_size = get_used_size(); set_written_to(4096); - set_used_size(0); replay(); ASSERT_EQ(old_written_to, get_written_to()); ASSERT_EQ(old_used_size, -- 2.39.5