]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
osd: don't share osdmap with objecter when preboot 14321/head
authorMingxin Liu <mingxin@xsky.com>
Mon, 13 Mar 2017 15:41:58 +0000 (23:41 +0800)
committerShinobu Kinjo <shinobu@redhat.com>
Tue, 4 Apr 2017 15:58:08 +0000 (00:58 +0900)
Signed-off-by: Mingxin Liu <mingxin@xsky.com>
(cherry picked from commit a5a3644eecc49b4eea890c6999fe87536495dcbe)

src/osd/OSD.cc

index 3b62ef3755b80c74bb6ef8c8ca82a6622424ea68..ac863c3be3ada6805473e76103e0813c4e9c5a17 100644 (file)
@@ -6819,7 +6819,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();