From b64578091e0afdbda05c69f3b29cb5947beac223 Mon Sep 17 00:00:00 2001 From: Matan Breizman Date: Wed, 31 Jan 2024 12:46:38 +0000 Subject: [PATCH] mon/OSDMonitor: rename get_lower_bound to get_lower_bound_by_pool Signed-off-by: Matan Breizman (cherry picked from commit 1f89b685c0c5c4891b5587ff4e480a615e6f5a48) --- src/mon/OSDMonitor.cc | 4 ++-- src/mon/OSDMonitor.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc index e3ad324c0e4..6047bfef152 100644 --- a/src/mon/OSDMonitor.cc +++ b/src/mon/OSDMonitor.cc @@ -397,7 +397,7 @@ void LastEpochClean::report(unsigned pg_num, const pg_t& pg, return lec.report(pg_num, pg.ps(), last_epoch_clean); } -epoch_t LastEpochClean::get_lower_bound(const OSDMap& latest) const +epoch_t LastEpochClean::get_lower_bound_by_pool(const OSDMap& latest) const { auto floor = latest.get_epoch(); for (auto& pool : latest.get_pools()) { @@ -2333,7 +2333,7 @@ version_t OSDMonitor::get_trim_to() const epoch_t OSDMonitor::get_min_last_epoch_clean() const { - auto floor = last_epoch_clean.get_lower_bound(osdmap); + auto floor = last_epoch_clean.get_lower_bound_by_pool(osdmap); // also scan osd epochs // don't trim past the oldest reported osd epoch for (auto [osd, epoch] : osd_epochs) { diff --git a/src/mon/OSDMonitor.h b/src/mon/OSDMonitor.h index 992fb9deadc..b00144de4b3 100644 --- a/src/mon/OSDMonitor.h +++ b/src/mon/OSDMonitor.h @@ -113,7 +113,7 @@ class LastEpochClean { public: void report(unsigned pg_num, const pg_t& pg, epoch_t last_epoch_clean); void remove_pool(uint64_t pool); - epoch_t get_lower_bound(const OSDMap& latest) const; + epoch_t get_lower_bound_by_pool(const OSDMap& latest) const; void dump(Formatter *f) const; }; -- 2.47.3