From d41297a95c51be0964a24c68070c00b161718ad5 Mon Sep 17 00:00:00 2001 From: Yingxin Cheng Date: Fri, 19 Aug 2022 15:05:26 +0800 Subject: [PATCH] crimson/os/seastore: move journal_type_t to seastore_types.h with shorter names Signed-off-by: Yingxin Cheng --- src/crimson/os/seastore/journal.h | 5 ----- .../os/seastore/journal/circular_bounded_journal.h | 2 +- src/crimson/os/seastore/journal/segmented_journal.h | 2 +- src/crimson/os/seastore/seastore_types.h | 8 +++++++- src/test/crimson/seastore/test_transaction_manager.cc | 4 ++-- .../crimson/seastore/transaction_manager_test_state.h | 10 +++++----- 6 files changed, 16 insertions(+), 15 deletions(-) diff --git a/src/crimson/os/seastore/journal.h b/src/crimson/os/seastore/journal.h index 1500649428e..18c0797a8b8 100644 --- a/src/crimson/os/seastore/journal.h +++ b/src/crimson/os/seastore/journal.h @@ -19,11 +19,6 @@ class SegmentManagerGroup; class SegmentProvider; class JournalTrimmer; -enum class journal_type_t { - SEGMENT_JOURNAL = 0, - CIRCULARBOUNDED_JOURNAL -}; - class Journal { public: virtual JournalTrimmer &get_trimmer() = 0; diff --git a/src/crimson/os/seastore/journal/circular_bounded_journal.h b/src/crimson/os/seastore/journal/circular_bounded_journal.h index 9be8eb0f508..3c777883b74 100644 --- 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::CIRCULARBOUNDED_JOURNAL; + return journal_type_t::CIRCULAR; } submit_record_ret submit_record( diff --git a/src/crimson/os/seastore/journal/segmented_journal.h b/src/crimson/os/seastore/journal/segmented_journal.h index 2ac1f2bcce2..dbeede8944e 100644 --- a/src/crimson/os/seastore/journal/segmented_journal.h +++ b/src/crimson/os/seastore/journal/segmented_journal.h @@ -52,7 +52,7 @@ public: } journal_type_t get_type() final { - return journal_type_t::SEGMENT_JOURNAL; + return journal_type_t::SEGMENTED; } seastar::future<> finish_commit(transaction_type_t type) { return seastar::now(); diff --git a/src/crimson/os/seastore/seastore_types.h b/src/crimson/os/seastore/seastore_types.h index 250c791a491..3f8c0ce16a5 100644 --- a/src/crimson/os/seastore/seastore_types.h +++ b/src/crimson/os/seastore/seastore_types.h @@ -863,7 +863,13 @@ std::ostream& operator<<(std::ostream& out, device_type_t t); bool can_delay_allocation(device_type_t type); device_type_t string_to_device_type(std::string type); -/* Monotonically increasing identifier for the location of a +enum class journal_type_t { + SEGMENTED, + CIRCULAR +}; + +/** + * Monotonically increasing identifier for the location of a * journal_record. */ // JOURNAL_SEQ_NULL == JOURNAL_SEQ_MAX == journal_seq_t{} diff --git a/src/test/crimson/seastore/test_transaction_manager.cc b/src/test/crimson/seastore/test_transaction_manager.cc index d01f262af87..6b79835616f 100644 --- a/src/test/crimson/seastore/test_transaction_manager.cc +++ b/src/test/crimson/seastore/test_transaction_manager.cc @@ -74,9 +74,9 @@ struct transaction_manager_test_t : seastar::future<> set_up_fut() final { std::string j_type = GetParam(); if (j_type == "segmented") { - return tm_setup(journal_type_t::SEGMENT_JOURNAL); + return tm_setup(journal_type_t::SEGMENTED); } else if (j_type == "circularbounded") { - return tm_setup(journal_type_t::CIRCULARBOUNDED_JOURNAL); + return tm_setup(journal_type_t::CIRCULAR); } 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 1a8a310afec..3c9761a8e4b 100644 --- a/src/test/crimson/seastore/transaction_manager_test_state.h +++ b/src/test/crimson/seastore/transaction_manager_test_state.h @@ -128,15 +128,15 @@ protected: } seastar::future<> tm_setup( - journal_type_t type = journal_type_t::SEGMENT_JOURNAL) { + journal_type_t type = journal_type_t::SEGMENTED) { LOG_PREFIX(EphemeralTestState::tm_setup); SUBINFO(test, "begin with {} devices ...", get_num_devices()); journal_type = type; // FIXME: should not initialize segment_manager with circularbounded-journal - if (journal_type == journal_type_t::SEGMENT_JOURNAL) { + if (journal_type == journal_type_t::SEGMENTED) { return segment_setup(); } else { - assert(journal_type == journal_type_t::CIRCULARBOUNDED_JOURNAL); + assert(journal_type == journal_type_t::CIRCULAR); 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::CIRCULARBOUNDED_JOURNAL) { + if (journal_type == journal_type_t::CIRCULAR) { // 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()); @@ -213,7 +213,7 @@ protected: } virtual FuturizedStore::mkfs_ertr::future<> _mkfs() { - if (journal_type == journal_type_t::SEGMENT_JOURNAL) { + if (journal_type == journal_type_t::SEGMENTED) { return tm->mkfs( ).handle_error( crimson::ct_error::assert_all{"Error in mkfs"} -- 2.39.5