osd: Remove oldest_stored_osdmap()

The only usage was for identyfing map gaps on new intervals.
We should use max_oldest_stored_osdmap() instead, since a specific
osd's oldest_map may lag behind.

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

diff --git a/src/crimson/osd/pg.h b/src/crimson/osd/pg.h
index 9208cc2d47642e50e9ad9d43abd8d6d2f869d890..61159ca1ad027b1c62ef529623a41ffc3b22b08f 100644 (file)
--- a/src/crimson/osd/pg.h
+++ b/src/crimson/osd/pg.h
@@ -344,10 +344,6 @@ public:
   void on_active_advmap(const OSDMapRef &osdmap) final {
     // Not needed yet
   }
-  epoch_t oldest_stored_osdmap() final {
-    // TODO
-    return 0;
-  }
 
   epoch_t max_oldest_stored_osdmap() final {
     // TODO

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index fcd63807274d88bdd613b7788c349e1a5b995cd9..1850bd8a6d145ead053a0b7f4d9837c4edff5c4d 100644 (file)
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -1572,10 +1572,6 @@ void PG::on_new_interval()
   cancel_recovery();
 }
 
-epoch_t PG::oldest_stored_osdmap() {
-  return osd->get_superblock().oldest_map;
-}
-
 epoch_t PG::max_oldest_stored_osdmap() {
   return osd->get_superblock().max_oldest_map;
 }

diff --git a/src/osd/PG.h b/src/osd/PG.h
index 408e8114ef519c26336fea97dcff92da16ff2742..ba5f1d71fed42872cfecac30ff57a6e3a9ab62ab 100644 (file)
--- a/src/osd/PG.h
+++ b/src/osd/PG.h
@@ -518,7 +518,6 @@ public:
   void clear_publish_stats() override;
   void clear_primary_state() override;
 
-  epoch_t oldest_stored_osdmap() override;
   epoch_t max_oldest_stored_osdmap() override;
   OstreamTemp get_clog_error() override;
   OstreamTemp get_clog_info() override;

diff --git a/src/osd/PeeringState.cc b/src/osd/PeeringState.cc
index 5fa76a7a7b23c52ab2e1c24792052f7a6b2f07b2..2401abda0ab24166f11868abae4e00afa501a680 100644 (file)
--- a/src/osd/PeeringState.cc
+++ b/src/osd/PeeringState.cc
@@ -665,7 +665,7 @@ void PeeringState::start_peering_interval(
     psdout(10) << __func__ << ": check_new_interval output: "
               << debug.str() << dendl;
     if (new_interval) {
-      if (osdmap->get_epoch() == pl->oldest_stored_osdmap() &&
+      if (osdmap->get_epoch() == pl->max_oldest_stored_osdmap() &&
          info.history.last_epoch_clean < osdmap->get_epoch()) {
        psdout(10) << " map gap, clearing past_intervals and faking" << dendl;
        // our information is incomplete and useless; someone else was clean

diff --git a/src/osd/PeeringState.h b/src/osd/PeeringState.h
index d3ac117b96167db376f40b005f096c9571cbc68e..9467b43e90bc997105020592e12c43a34df505ce 100644 (file)
--- a/src/osd/PeeringState.h
+++ b/src/osd/PeeringState.h
@@ -390,7 +390,6 @@ public:
     // ==================== Std::map notifications ===================
     virtual void on_active_actmap() = 0;
     virtual void on_active_advmap(const OSDMapRef &osdmap) = 0;
-    virtual epoch_t oldest_stored_osdmap() = 0;
     virtual epoch_t max_oldest_stored_osdmap() = 0;
 
     // ============ recovery reservation notifications ==========