Skip to content

Commit db34277

Browse files
committed
crimson/os/seastore/async_cleaner: rename rewrite_backref_bytes_per_cycle to max_backref_bytes_per_cycle
Unlike rewrite_dirty_bytes_per_cycle which serves as the maximum bytes that trim_dirty can trim and create, rewrite_backref_bytes_per_cycle only indicate the maximum bytes of new backref extents that trim_alloc can generate. So we rename it to avoid misunderstanding. Signed-off-by: Xuehan Xu <[email protected]>
1 parent cdcce0d commit db34277

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

src/crimson/os/seastore/async_cleaner.cc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,7 @@ void JournalTrimmerImpl::config_t::validate() const
348348
ceph_assert(rewrite_dirty_bytes_per_trans > 0);
349349
ceph_assert(rewrite_dirty_bytes_per_cycle >=
350350
rewrite_dirty_bytes_per_trans);
351-
ceph_assert(rewrite_backref_bytes_per_cycle > 0);
351+
ceph_assert(max_backref_bytes_per_cycle > 0);
352352
}
353353

354354
JournalTrimmerImpl::config_t
@@ -379,7 +379,7 @@ JournalTrimmerImpl::config_t::get_default(
379379
max_journal_bytes,
380380
1<<26,// rewrite_dirty_bytes_per_cycle
381381
1<<17,// rewrite_dirty_bytes_per_trans
382-
1<<24 // rewrite_backref_bytes_per_cycle
382+
1<<24 // max_backref_bytes_per_cycle
383383
};
384384
}
385385

@@ -413,7 +413,7 @@ JournalTrimmerImpl::config_t::get_test(
413413
? 1<<25
414414
: target_dirty_bytes / 2,// rewrite_dirty_bytes_per_cycle
415415
1<<17,// rewrite_dirty_bytes_per_trans
416-
1<<24 // rewrite_backref_bytes_per_cycle
416+
1<<24 // max_backref_bytes_per_cycle
417417
};
418418
}
419419

@@ -659,7 +659,7 @@ JournalTrimmerImpl::trim_alloc()
659659
return backref_manager.merge_cached_backrefs(
660660
t,
661661
target,
662-
config.rewrite_backref_bytes_per_cycle
662+
config.max_backref_bytes_per_cycle
663663
).si_then([this, FNAME, &t](auto trim_alloc_to)
664664
-> ExtentCallbackInterface::submit_transaction_direct_iertr::future<>
665665
{

src/crimson/os/seastore/async_cleaner.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -517,8 +517,8 @@ class JournalTrimmerImpl : public JournalTrimmer {
517517
std::size_t rewrite_dirty_bytes_per_cycle = 0;
518518
/// Number of bytes to rewrite dirty per transaction
519519
std::size_t rewrite_dirty_bytes_per_trans = 0;
520-
/// Number of bytes to rewrite backref per cycle
521-
std::size_t rewrite_backref_bytes_per_cycle = 0;
520+
/// Maximum number of bytes of new backref extents per cycle
521+
std::size_t max_backref_bytes_per_cycle = 0;
522522

523523
void validate() const;
524524

@@ -566,7 +566,7 @@ class JournalTrimmerImpl : public JournalTrimmer {
566566
journal_seq_t dirty_tail, journal_seq_t alloc_tail) final;
567567

568568
std::size_t get_trim_size_per_cycle() const final {
569-
return config.rewrite_backref_bytes_per_cycle +
569+
return config.max_backref_bytes_per_cycle +
570570
get_dirty_bytes_to_trim();
571571
}
572572

0 commit comments

Comments
 (0)