From b8ee3353bd7a5cbfafc57b00c0c642a7b70d7341 Mon Sep 17 00:00:00 2001 From: myoungwon oh Date: Fri, 13 May 2022 17:28:09 +0900 Subject: [PATCH] seastore/cbjournal: add assert(initialized), revmoving open_device_read_header() Signed-off-by: Myoungwon Oh --- .../journal/circular_bounded_journal.cc | 22 +++++++++---------- .../seastore/transaction_manager_test_state.h | 12 ++++++---- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/src/crimson/os/seastore/journal/circular_bounded_journal.cc b/src/crimson/os/seastore/journal/circular_bounded_journal.cc index 19bf019a3d5..cc44df9d46b 100644 --- a/src/crimson/os/seastore/journal/circular_bounded_journal.cc +++ b/src/crimson/os/seastore/journal/circular_bounded_journal.cc @@ -102,18 +102,16 @@ ceph::bufferlist CircularBoundedJournal::encode_header() CircularBoundedJournal::open_for_write_ret CircularBoundedJournal::open_for_write() { - if (initialized) { - paddr_t paddr = convert_abs_addr_to_paddr( - get_written_to(), - header.device_id); - return open_for_write_ret( - open_for_write_ertr::ready_future_marker{}, - journal_seq_t{ - cur_segment_seq, - paddr - }); - } - return open_device_read_header(CBJOURNAL_START_ADDRESS); + ceph_assert(initialized); + paddr_t paddr = convert_abs_addr_to_paddr( + get_written_to(), + header.device_id); + return open_for_write_ret( + open_for_write_ertr::ready_future_marker{}, + journal_seq_t{ + cur_segment_seq, + paddr + }); } CircularBoundedJournal::close_ertr::future<> CircularBoundedJournal::close() diff --git a/src/test/crimson/seastore/transaction_manager_test_state.h b/src/test/crimson/seastore/transaction_manager_test_state.h index 823d7b8305e..f30fe92cd0a 100644 --- a/src/test/crimson/seastore/transaction_manager_test_state.h +++ b/src/test/crimson/seastore/transaction_manager_test_state.h @@ -208,10 +208,14 @@ protected: return static_cast(tm->get_journal())->mkfs( config ).safe_then([this]() { - return tm->mkfs( - ).handle_error( - crimson::ct_error::assert_all{"Error in mkfs"} - ); + return static_cast(tm->get_journal())-> + open_device_read_header(journal::CBJOURNAL_START_ADDRESS + ).safe_then([this](auto addr) { + return tm->mkfs( + ).handle_error( + crimson::ct_error::assert_all{"Error in mkfs"} + ); + }); }).handle_error( crimson::ct_error::assert_all{"Error in mkfs"} ); -- 2.39.5