From: linbing <hawkerous@gmail.com>
Date: Thu, 8 Jun 2017 00:39:47 +0000 (+0800)
Subject: osd: when osd is not in failure_pending, we don't need to get osd inst from osdmap.
X-Git-Tag: v12.1.0~198^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F15558%2Fhead;p=ceph.git

osd: when osd is not in failure_pending, we don't need to get osd inst from osdmap.

Signed-off-by: linbing <linbing@t2cloud.net>
---

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 72fe11542d09..922b070a7077 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -5881,8 +5881,8 @@ void OSD::send_failures()
   utime_t now = ceph_clock_now();
   while (!failure_queue.empty()) {
     int osd = failure_queue.begin()->first;
-    entity_inst_t i = osdmap->get_inst(osd);
     if (!failure_pending.count(osd)) {
+      entity_inst_t i = osdmap->get_inst(osd);
       int failed_for = (int)(double)(now - failure_queue.begin()->second);
       monc->send_mon_message(new MOSDFailure(monc->get_fsid(), i, failed_for,
 					     osdmap->get_epoch()));