messages/MOSDMap: Remove get_oldest/newest

cluster_osdmap_trim_lower_bound and newest_map are public.

Signed-off-by: Matan Breizman <mbreizma@redhat.com>
(cherry picked from commit 0c5f02ed5c79232e81e4ce5e6656e7502acb0ac6)

diff --git a/src/messages/MOSDMap.h b/src/messages/MOSDMap.h
index a74873b0401407bb18aa422f82ca28d236b27670..c9dd6991f85c50d86d2aeeac24b62e585fcf1ace 100644 (file)
--- a/src/messages/MOSDMap.h
+++ b/src/messages/MOSDMap.h
@@ -68,13 +68,6 @@ public:
         (e == 0 || i->first > e)) e = i->first;
     return e;
   }
-  epoch_t get_oldest() {
-    return cluster_osdmap_trim_lower_bound;
-  }
-  epoch_t get_newest() {
-    return newest_map;
-  }
-
 
   MOSDMap() : Message{CEPH_MSG_OSD_MAP, HEAD_VERSION, COMPAT_VERSION} { }
   MOSDMap(const uuid_d &f, const uint64_t features)

diff --git a/src/osdc/Objecter.cc b/src/osdc/Objecter.cc
index e821b4ee00f0443a750726fe8d06d5dfbd0586eb..b225c5236e51356682d63fdb607c5b93919bba7a 100644 (file)
--- a/src/osdc/Objecter.cc
+++ b/src/osdc/Objecter.cc
@@ -1220,7 +1220,7 @@ void Objecter::handle_osd_map(MOSDMap *m)
          logger->inc(l_osdc_map_full);
        }
        else {
-         if (e >= m->get_oldest()) {
+         if (e >= m->cluster_osdmap_trim_lower_bound) {
            ldout(cct, 3) << "handle_osd_map requesting missing epoch "
                          << osdmap->get_epoch()+1 << dendl;
            _maybe_request_map();
@@ -1228,8 +1228,9 @@ void Objecter::handle_osd_map(MOSDMap *m)
          }
          ldout(cct, 3) << "handle_osd_map missing epoch "
                        << osdmap->get_epoch()+1
-                       << ", jumping to " << m->get_oldest() << dendl;
-         e = m->get_oldest() - 1;
+                       << ", jumping to "
+                       << m->cluster_osdmap_trim_lower_bound << dendl;
+         e = m->cluster_osdmap_trim_lower_bound - 1;
          skipped_map = true;
          continue;
        }