From: Mingxin Liu <mingxin@xsky.com>
Date: Mon, 13 Mar 2017 15:41:58 +0000 (+0800)
Subject: osd: don't share osdmap with objecter when preboot
X-Git-Tag: v10.2.8~100^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F14326%2Fhead;p=ceph.git

osd: don't share osdmap with objecter when preboot

Signed-off-by: Mingxin Liu <mingxin@xsky.com>
(cherry picked from commit a5a3644eecc49b4eea890c6999fe87536495dcbe)
---

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index a5c92fb48113..1fddc8afcd9d 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -6610,7 +6610,8 @@ void OSD::handle_osd_map(MOSDMap *m)
     session->put();
 
   // share with the objecter
-  service.objecter->handle_osd_map(m);
+  if (!is_preboot())
+    service.objecter->handle_osd_map(m);
 
   epoch_t first = m->get_first();
   epoch_t last = m->get_last();