From e95bb11afdbe56671b3b2d845d19fed26c5c5ec2 Mon Sep 17 00:00:00 2001 From: myoungwon oh Date: Thu, 12 May 2022 16:58:40 +0900 Subject: [PATCH] seastore: rename journal_type to journal_type_t Signed-off-by: Myoungwon Oh --- src/crimson/os/seastore/journal.h | 4 ++-- src/crimson/os/seastore/journal/circular_bounded_journal.h | 4 ++-- src/crimson/os/seastore/journal/segmented_journal.h | 4 ++-- src/crimson/os/seastore/transaction_manager.cc | 2 +- src/crimson/os/seastore/transaction_manager.h | 4 ++-- src/test/crimson/seastore/test_transaction_manager.cc | 2 +- src/test/crimson/seastore/transaction_manager_test_state.h | 6 +++--- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/crimson/os/seastore/journal.h b/src/crimson/os/seastore/journal.h index 9ee5e9e34be22..50568175e6092 100644 --- a/src/crimson/os/seastore/journal.h +++ b/src/crimson/os/seastore/journal.h @@ -18,7 +18,7 @@ class NVMeBlockDevice; class SegmentManagerGroup; class SegmentProvider; -enum class journal_type { +enum class journal_type_t { SEGMENT_JOURNAL = 0, CIRCULARBOUNDED_JOURNAL }; @@ -93,7 +93,7 @@ public: virtual ~Journal() {} - virtual journal_type get_type() = 0; + virtual journal_type_t get_type() = 0; }; using JournalRef = std::unique_ptr; diff --git a/src/crimson/os/seastore/journal/circular_bounded_journal.h b/src/crimson/os/seastore/journal/circular_bounded_journal.h index 141b467fe8fc9..1910571cfc3b4 100644 --- a/src/crimson/os/seastore/journal/circular_bounded_journal.h +++ b/src/crimson/os/seastore/journal/circular_bounded_journal.h @@ -86,8 +86,8 @@ public: open_for_write_ret open_device_read_header(rbm_abs_addr start); close_ertr::future<> close() final; - journal_type get_type() final { - return journal_type::CIRCULARBOUNDED_JOURNAL; + journal_type_t get_type() final { + return journal_type_t::CIRCULARBOUNDED_JOURNAL; } 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 558189b374331..46c3675bdf1fd 100644 --- a/src/crimson/os/seastore/journal/segmented_journal.h +++ b/src/crimson/os/seastore/journal/segmented_journal.h @@ -43,8 +43,8 @@ public: write_pipeline = _write_pipeline; } - journal_type get_type() final { - return journal_type::SEGMENT_JOURNAL; + journal_type_t get_type() final { + return journal_type_t::SEGMENT_JOURNAL; } private: diff --git a/src/crimson/os/seastore/transaction_manager.cc b/src/crimson/os/seastore/transaction_manager.cc index c21e5d27d584f..48d59c1078d0d 100644 --- a/src/crimson/os/seastore/transaction_manager.cc +++ b/src/crimson/os/seastore/transaction_manager.cc @@ -649,7 +649,7 @@ TransactionManagerRef make_transaction_manager(tm_make_config_t config) *cache, config.detailed); JournalRef journal; - if (config.j_type == journal_type::SEGMENT_JOURNAL) { + if (config.j_type == journal_type_t::SEGMENT_JOURNAL) { journal = journal::make_segmented(*segment_cleaner); } else { journal = journal::make_circularbounded( diff --git a/src/crimson/os/seastore/transaction_manager.h b/src/crimson/os/seastore/transaction_manager.h index 59f561888ab03..f0e858b9f42ce 100644 --- a/src/crimson/os/seastore/transaction_manager.h +++ b/src/crimson/os/seastore/transaction_manager.h @@ -593,13 +593,13 @@ using TransactionManagerRef = std::unique_ptr; struct tm_make_config_t { bool detailed = true; - journal_type j_type = journal_type::SEGMENT_JOURNAL; + journal_type_t j_type = journal_type_t::SEGMENT_JOURNAL; placement_hint_t default_placement_hint = placement_hint_t::HOT; static tm_make_config_t get_default() { return tm_make_config_t { true, - journal_type::SEGMENT_JOURNAL, + journal_type_t::SEGMENT_JOURNAL, placement_hint_t::HOT }; } diff --git a/src/test/crimson/seastore/test_transaction_manager.cc b/src/test/crimson/seastore/test_transaction_manager.cc index 549ccaf4f17bd..649d681796f32 100644 --- a/src/test/crimson/seastore/test_transaction_manager.cc +++ b/src/test/crimson/seastore/test_transaction_manager.cc @@ -78,7 +78,7 @@ struct transaction_manager_test_t : if (j_type == "segmented") { return tm_setup(tm_config); } else if (j_type == "circularbounded") { - tm_config.j_type = journal_type::CIRCULARBOUNDED_JOURNAL; + tm_config.j_type = journal_type_t::CIRCULARBOUNDED_JOURNAL; tm_config.default_placement_hint = placement_hint_t::REWRITE; return tm_setup(tm_config); } else { diff --git a/src/test/crimson/seastore/transaction_manager_test_state.h b/src/test/crimson/seastore/transaction_manager_test_state.h index 8f2934cf8b2ef..823d7b8305e84 100644 --- a/src/test/crimson/seastore/transaction_manager_test_state.h +++ b/src/test/crimson/seastore/transaction_manager_test_state.h @@ -69,7 +69,7 @@ protected: for (auto &sec_sm : secondary_segment_managers) { sec_sm = segment_manager::create_test_ephemeral(); } - if (tm_config.j_type == journal_type::CIRCULARBOUNDED_JOURNAL) { + if (tm_config.j_type == journal_type_t::CIRCULARBOUNDED_JOURNAL) { auto config = journal::CircularBoundedJournal::mkfs_config_t::get_default(); rb_device.reset(new nvme_device::TestMemory(config.total_size)); @@ -155,7 +155,7 @@ protected: virtual void _init() override { tm = make_transaction_manager(tm_config); tm->add_device(segment_manager.get(), true); - if (tm_config.j_type == journal_type::CIRCULARBOUNDED_JOURNAL) { + if (tm_config.j_type == journal_type_t::CIRCULARBOUNDED_JOURNAL) { tm->add_device(rb_device.get(), false); static_cast(tm->get_journal())-> add_device(rb_device.get()); @@ -198,7 +198,7 @@ protected: } virtual FuturizedStore::mkfs_ertr::future<> _mkfs() { - if (tm_config.j_type == journal_type::SEGMENT_JOURNAL) { + if (tm_config.j_type == journal_type_t::SEGMENT_JOURNAL) { return tm->mkfs( ).handle_error( crimson::ct_error::assert_all{"Error in mkfs"} -- 2.39.5