]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
mon/OSDMonitor: rename get_lower_bound to get_lower_bound_by_pool
authorMatan Breizman <mbreizma@redhat.com>
Wed, 31 Jan 2024 12:46:38 +0000 (12:46 +0000)
committerMykola Golub <mgolub@suse.com>
Fri, 1 Mar 2024 12:10:00 +0000 (14:10 +0200)
Signed-off-by: Matan Breizman <mbreizma@redhat.com>
(cherry picked from commit 1f89b685c0c5c4891b5587ff4e480a615e6f5a48)

src/mon/OSDMonitor.cc
src/mon/OSDMonitor.h

index e3ad324c0e4ae3c7491fcde7bf62fdf75a54febf..6047bfef1529ad8ebc2ad33a05445a8a070ae21e 100644 (file)
@@ -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) {
index 992fb9deadc9ec00f2fb0987f7dec3b8e2cc8066..b00144de4b318369e690992f7c3ea1752048ebab 100644 (file)
@@ -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;
 };