From: Sage Weil <sage@redhat.com>
Date: Wed, 30 May 2018 17:43:09 +0000 (-0500)
Subject: mon/OSDMonitor: kill get_most_recent_inst usage
X-Git-Tag: v14.0.1~1208^2~22
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8dbb15f96fd245c0e84ce9a1a63524467b02ab1a;p=ceph.git

mon/OSDMonitor: kill get_most_recent_inst usage

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index 6eae84302dc1..1dc4bf8c4cc0 100644
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -2676,7 +2676,7 @@ bool OSDMonitor::preprocess_boot(MonOpRequestRef op)
 
   if (osdmap.exists(from) &&
       osdmap.get_info(from).up_from > m->version &&
-      osdmap.get_most_recent_inst(from) == m->get_orig_source_inst()) {
+      osdmap.get_most_recent_addrs(from) == m->get_orig_source_addrs()) {
     dout(7) << "prepare_boot msg from before last up_from, ignoring" << dendl;
     send_latest(op, m->sb.current_epoch+1);
     return true;
@@ -2893,7 +2893,7 @@ bool OSDMonitor::preprocess_full(MonOpRequestRef op)
     goto ignore;
   }
   if ((!osdmap.is_up(from) &&
-       osdmap.get_most_recent_inst(from) == m->get_orig_source_inst()) ||
+       osdmap.get_most_recent_addrs(from) == m->get_orig_source_addrs()) ||
       (osdmap.is_up(from) &&
        osdmap.get_inst(from) != m->get_orig_source_inst())) {
     dout(7) << __func__ << " ignoring full message from down "