From a8348dfc9a614f40a0ebd35b8e21b8af9da2afce Mon Sep 17 00:00:00 2001 From: Yingxin Cheng Date: Tue, 10 Jun 2025 10:48:35 +0800 Subject: [PATCH] crimson/os/seastore/async_cleaner: rename min_journal_dirty_bytes Signed-off-by: Yingxin Cheng --- src/crimson/os/seastore/async_cleaner.cc | 20 ++++++++++---------- src/crimson/os/seastore/async_cleaner.h | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/crimson/os/seastore/async_cleaner.cc b/src/crimson/os/seastore/async_cleaner.cc index d998c53a41f23..d6508a6b63e07 100644 --- a/src/crimson/os/seastore/async_cleaner.cc +++ b/src/crimson/os/seastore/async_cleaner.cc @@ -342,7 +342,7 @@ void JournalTrimmerImpl::config_t::validate() const { ceph_assert(max_journal_bytes <= DEVICE_OFF_MAX); ceph_assert(max_journal_bytes > target_journal_dirty_bytes); - ceph_assert(target_journal_dirty_bytes >= min_journal_bytes); + ceph_assert(target_journal_dirty_bytes >= min_journal_dirty_bytes); ceph_assert(target_journal_dirty_bytes > rewrite_dirty_bytes_per_cycle); ceph_assert(max_journal_bytes > target_journal_alloc_bytes); ceph_assert(rewrite_dirty_bytes_per_trans > 0); @@ -358,16 +358,16 @@ JournalTrimmerImpl::config_t::get_default( assert(roll_size); std::size_t target_dirty_bytes = 0; std::size_t target_alloc_bytes = 0; - std::size_t min_journal_bytes = 0; + std::size_t min_dirty_bytes = 0; std::size_t max_journal_bytes = 0; if (type == backend_type_t::SEGMENTED) { - min_journal_bytes = 12 * roll_size; + min_dirty_bytes = 12 * roll_size; target_alloc_bytes = 2 * roll_size; target_dirty_bytes = 14 * roll_size; max_journal_bytes = 16 * roll_size; } else { assert(type == backend_type_t::RANDOM_BLOCK); - min_journal_bytes = roll_size / 4; + min_dirty_bytes = roll_size / 4; target_alloc_bytes = roll_size / 4; target_dirty_bytes = roll_size / 3; max_journal_bytes = roll_size / 2; @@ -375,7 +375,7 @@ JournalTrimmerImpl::config_t::get_default( return config_t{ target_dirty_bytes, target_alloc_bytes, - min_journal_bytes, + min_dirty_bytes, max_journal_bytes, 1<<26,// rewrite_dirty_bytes_per_cycle, 64MB 1<<17,// rewrite_dirty_bytes_per_trans, 128KB @@ -390,16 +390,16 @@ JournalTrimmerImpl::config_t::get_test( assert(roll_size); std::size_t target_dirty_bytes = 0; std::size_t target_alloc_bytes = 0; - std::size_t min_journal_bytes = 0; + std::size_t min_dirty_bytes = 0; std::size_t max_journal_bytes = 0; if (type == backend_type_t::SEGMENTED) { - min_journal_bytes = 2 * roll_size; + min_dirty_bytes = 2 * roll_size; target_alloc_bytes = 2 * roll_size; target_dirty_bytes = 3 * roll_size; max_journal_bytes = 4 * roll_size; } else { assert(type == backend_type_t::RANDOM_BLOCK); - min_journal_bytes = roll_size / 36; + min_dirty_bytes = roll_size / 36; target_alloc_bytes = roll_size / 4; target_dirty_bytes = roll_size / 24; max_journal_bytes = roll_size / 2; @@ -407,7 +407,7 @@ JournalTrimmerImpl::config_t::get_test( return config_t{ target_dirty_bytes, target_alloc_bytes, - min_journal_bytes, + min_dirty_bytes, max_journal_bytes, (target_dirty_bytes > 1<<26) ? 1<<25 @@ -535,7 +535,7 @@ journal_seq_t JournalTrimmerImpl::get_dirty_tail_min_target() const assert(background_callback->is_ready()); auto ret = journal_head.add_offset( backend_type, - -static_cast(config.min_journal_bytes), + -static_cast(config.min_journal_dirty_bytes), roll_start, roll_size); return ret; diff --git a/src/crimson/os/seastore/async_cleaner.h b/src/crimson/os/seastore/async_cleaner.h index 2dd465ad73ac5..72460c7c76c88 100644 --- a/src/crimson/os/seastore/async_cleaner.h +++ b/src/crimson/os/seastore/async_cleaner.h @@ -503,14 +503,14 @@ class JournalTrimmerImpl : public JournalTrimmer { public: struct config_t { /// Number of minimum bytes to start trimming dirty, - // this must be larger than or equal to min_journal_bytes, + // this must be larger than or equal to min_journal_dirty_bytes, // otherwise trim_dirty may never happen. std::size_t target_journal_dirty_bytes = 0; /// Number of minimum bytes to stop trimming allocation /// (having the corresponding backrefs unmerged) std::size_t target_journal_alloc_bytes = 0; /// Number of minimum dirty bytes of the journal. - std::size_t min_journal_bytes = 0; + std::size_t min_journal_dirty_bytes = 0; /// Number of maximum bytes to block user transactions. std::size_t max_journal_bytes = 0; /// Number of bytes to rewrite dirty per cycle @@ -667,10 +667,10 @@ private: } std::size_t get_max_dirty_bytes_to_trim() const { auto journal_dirty_bytes = get_journal_dirty_bytes(); - if (journal_dirty_bytes <= config.min_journal_bytes) { + if (journal_dirty_bytes <= config.min_journal_dirty_bytes) { return 0; } - return journal_dirty_bytes - config.min_journal_bytes; + return journal_dirty_bytes - config.min_journal_dirty_bytes; } std::size_t get_dirty_bytes_to_trim() const { return std::min(get_max_dirty_bytes_to_trim(), -- 2.39.5