From 3adb17bf04252d9c1afd9050ed1e876bd6c654b9 Mon Sep 17 00:00:00 2001 From: Zhang Song Date: Tue, 10 Jan 2023 16:19:38 +0800 Subject: [PATCH] crimson/os/seastore/EPM/BackgroundProcess: rename cleaner to main_cleaner Signed-off-by: Zhang Song --- .../os/seastore/extent_placement_manager.cc | 18 +++++----- .../os/seastore/extent_placement_manager.h | 36 +++++++++---------- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/src/crimson/os/seastore/extent_placement_manager.cc b/src/crimson/os/seastore/extent_placement_manager.cc index 27e2b31601ca2..78ca3796a6554 100644 --- a/src/crimson/os/seastore/extent_placement_manager.cc +++ b/src/crimson/os/seastore/extent_placement_manager.cc @@ -348,7 +348,7 @@ void ExtentPlacementManager::BackgroundProcess::log_state(const char *caller) co DEBUG("caller {}, {}, {}", caller, JournalTrimmerImpl::stat_printer_t{*trimmer, true}, - AsyncCleaner::stat_printer_t{*cleaner, true}); + AsyncCleaner::stat_printer_t{*main_cleaner, true}); } void ExtentPlacementManager::BackgroundProcess::start_background() @@ -356,7 +356,7 @@ void ExtentPlacementManager::BackgroundProcess::start_background() LOG_PREFIX(BackgroundProcess::start_background); INFO("{}, {}", JournalTrimmerImpl::stat_printer_t{*trimmer, true}, - AsyncCleaner::stat_printer_t{*cleaner, true}); + AsyncCleaner::stat_printer_t{*main_cleaner, true}); ceph_assert(trimmer->check_is_ready()); ceph_assert(state == state_t::SCAN_SPACE); assert(!is_running()); @@ -386,7 +386,7 @@ ExtentPlacementManager::BackgroundProcess::stop_background() LOG_PREFIX(BackgroundProcess::stop_background); INFO("done, {}, {}", JournalTrimmerImpl::stat_printer_t{*trimmer, true}, - AsyncCleaner::stat_printer_t{*cleaner, true}); + AsyncCleaner::stat_printer_t{*main_cleaner, true}); // run_until_halt() can be called at HALT }); } @@ -423,7 +423,7 @@ ExtentPlacementManager::BackgroundProcess::try_reserve( { reserve_result_t res { trimmer->try_reserve_inline_usage(usage.inline_usage), - cleaner->try_reserve_projected_usage(usage.inline_usage + usage.ool_usage) + main_cleaner->try_reserve_projected_usage(usage.inline_usage + usage.ool_usage) }; if (!res.is_successful()) { @@ -431,7 +431,7 @@ ExtentPlacementManager::BackgroundProcess::try_reserve( trimmer->release_inline_usage(usage.inline_usage); } if (res.reserve_ool_success) { - cleaner->release_projected_usage(usage.inline_usage + usage.ool_usage); + main_cleaner->release_projected_usage(usage.inline_usage + usage.ool_usage); } } return res; @@ -516,22 +516,22 @@ ExtentPlacementManager::BackgroundProcess::do_background_cycle() bool trimmer_reserve_success = true; if (trimmer->should_trim()) { trimmer_reserve_success = - cleaner->try_reserve_projected_usage( + main_cleaner->try_reserve_projected_usage( trimmer->get_trim_size_per_cycle()); } if (trimmer->should_trim() && trimmer_reserve_success) { return trimmer->trim( ).finally([this] { - cleaner->release_projected_usage( + main_cleaner->release_projected_usage( trimmer->get_trim_size_per_cycle()); }); - } else if (cleaner->should_clean_space() || + } else if (main_cleaner->should_clean_space() || // make sure cleaner will start // when the trimmer should run but // failed to reserve space. !trimmer_reserve_success) { - return cleaner->clean_space( + return main_cleaner->clean_space( ).handle_error( crimson::ct_error::assert_all{ "do_background_cycle encountered invalid error in clean_space" diff --git a/src/crimson/os/seastore/extent_placement_manager.h b/src/crimson/os/seastore/extent_placement_manager.h index 7393dff3689e9..e5f8e53dc6923 100644 --- a/src/crimson/os/seastore/extent_placement_manager.h +++ b/src/crimson/os/seastore/extent_placement_manager.h @@ -419,8 +419,8 @@ private: AsyncCleanerRef &&_cleaner) { trimmer = std::move(_trimmer); trimmer->set_background_callback(this); - cleaner = std::move(_cleaner); - cleaner->set_background_callback(this); + main_cleaner = std::move(_cleaner); + main_cleaner->set_background_callback(this); } journal_type_t get_journal_type() const { @@ -429,11 +429,11 @@ private: void set_extent_callback(ExtentCallbackInterface *cb) { trimmer->set_extent_callback(cb); - cleaner->set_extent_callback(cb); + main_cleaner->set_extent_callback(cb); } store_statfs_t get_stat() const { - return cleaner->get_stat(); + return main_cleaner->get_stat(); } using mount_ret = ExtentPlacementManager::mount_ret; @@ -443,13 +443,13 @@ private: trimmer->reset(); stats = {}; register_metrics(); - return cleaner->mount(); + return main_cleaner->mount(); } void start_scan_space() { ceph_assert(state == state_t::MOUNT); state = state_t::SCAN_SPACE; - ceph_assert(cleaner->check_usage_is_empty()); + ceph_assert(main_cleaner->check_usage_is_empty()); } void start_background(); @@ -458,24 +458,24 @@ private: if (state < state_t::SCAN_SPACE) { return; } - assert(cleaner); - cleaner->mark_space_used(addr, len); + assert(main_cleaner); + main_cleaner->mark_space_used(addr, len); } void mark_space_free(paddr_t addr, extent_len_t len) { if (state < state_t::SCAN_SPACE) { return; } - assert(cleaner); - cleaner->mark_space_free(addr, len); + assert(main_cleaner); + main_cleaner->mark_space_free(addr, len); } void commit_space_used(paddr_t addr, extent_len_t len) { if (state < state_t::SCAN_SPACE) { return; } - assert(cleaner); - return cleaner->commit_space_used(addr, len); + assert(main_cleaner); + return main_cleaner->commit_space_used(addr, len); } seastar::future<> reserve_projected_usage(projected_usage_t usage); @@ -483,7 +483,7 @@ private: void release_projected_usage(projected_usage_t usage) { if (is_ready()) { trimmer->release_inline_usage(usage.inline_usage); - cleaner->release_projected_usage(usage.inline_usage + usage.ool_usage); + main_cleaner->release_projected_usage(usage.inline_usage + usage.ool_usage); } } @@ -495,13 +495,13 @@ private: // Testing interfaces bool check_usage() { - return cleaner->check_usage(); + return main_cleaner->check_usage(); } seastar::future<> run_until_halt(); bool is_no_background() const { - return !trimmer || !cleaner; + return !trimmer || !main_cleaner; } protected: @@ -552,7 +552,7 @@ private: bool background_should_run() const { assert(is_ready()); - return cleaner->should_clean_space() + return main_cleaner->should_clean_space() || trimmer->should_trim_dirty() || trimmer->should_trim_alloc(); } @@ -560,7 +560,7 @@ private: bool should_block_io() const { assert(is_ready()); return trimmer->should_block_io_on_trim() || - cleaner->should_block_io_on_clean(); + main_cleaner->should_block_io_on_clean(); } struct reserve_result_t { @@ -589,7 +589,7 @@ private: seastar::metrics::metric_group metrics; JournalTrimmerImplRef trimmer; - AsyncCleanerRef cleaner; + AsyncCleanerRef main_cleaner; std::optional> process_join; std::optional> blocking_background; -- 2.39.5