OSD: remove 'has_inst', which has the same function as 'is_up'

Signed-off-by: Pan Liu <pan.liu@istuary.com>

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index 8d5aeeff1198d99a19787351321c1cbe7cb80e2e..aa3179faf55031069fea58974827daed4f8a7b1e 100644 (file)
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -1566,7 +1566,7 @@ bool OSDMonitor::preprocess_failure(MonOpRequestRef op)
 
 
   // weird?
-  if (!osdmap.have_inst(badboy)) {
+  if (osdmap.is_down(badboy)) {
     dout(5) << "preprocess_failure dne(/dup?): " << m->get_target() << ", from " << m->get_orig_source_inst() << dendl;
     if (m->get_epoch() < osdmap.get_epoch())
       send_incremental(op, m->get_epoch()+1);

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 7510beea499810237d347fa0c734250505f3b4f5..7c3ebe4dce25f9f5a3e85145f40b4c5b0ade24af 100644 (file)
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -6983,15 +6983,15 @@ void OSD::_committed_osd_maps(epoch_t first, epoch_t last, MOSDMap *m)
     osdmap->get_all_osds(old);
     for (set<int>::iterator p = old.begin(); p != old.end(); ++p) {
       if (*p != whoami &&
-         osdmap->have_inst(*p) && // in old map
-         !newmap->is_up(*p)) {    // but not the new one
+         osdmap->is_up(*p) && // in old map
+         newmap->is_down(*p)) {    // but not the new one
         if (!waited_for_reservations) {
           service.await_reserved_maps();
           waited_for_reservations = true;
         }
        note_down_osd(*p);
       } else if (*p != whoami &&
-                !osdmap->have_inst(*p) &&
+                osdmap->is_down(*p) &&
                 newmap->is_up(*p)) {
         note_up_osd(*p);
       }
@@ -7502,11 +7502,11 @@ bool OSD::require_same_peer_instance(Message *m, OSDMapRef& map,
 {
   int from = m->get_source().num();
 
-  if (!map->have_inst(from) ||
+  if (map->is_down(from) ||
       (map->get_cluster_addr(from) != m->get_source_inst().addr)) {
     dout(5) << "from dead osd." << from << ", marking down, "
            << " msg was " << m->get_source_inst().addr
-           << " expected " << (map->have_inst(from) ?
+           << " expected " << (map->is_up(from) ?
                                map->get_cluster_addr(from) : entity_addr_t())
            << dendl;
     ConnectionRef con = m->get_connection();

diff --git a/src/osd/OSDMap.h b/src/osd/OSDMap.h
index bfa7a6533807d0aff0757c299f5f8d054d67093b..ddbfbb8d67ce36a6f22713ff06f03781dc71841e 100644 (file)
--- a/src/osd/OSDMap.h
+++ b/src/osd/OSDMap.h
@@ -460,9 +460,6 @@ public:
     return identify_osd(addr) >= 0;
   }
   int find_osd_on_ip(const entity_addr_t& ip) const;
-  bool have_inst(int osd) const {
-    return exists(osd) && is_up(osd); 
-  }
   const entity_addr_t &get_addr(int osd) const {
     assert(exists(osd));
     return osd_addrs->client_addr[osd] ? *osd_addrs->client_addr[osd] : osd_addrs->blank;