]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
osd: skip osdmap version query if we can
authorSage Weil <sage@redhat.com>
Wed, 23 Sep 2015 21:31:50 +0000 (17:31 -0400)
committerSage Weil <sage@redhat.com>
Mon, 23 Nov 2015 13:36:15 +0000 (08:36 -0500)
If we get OSDmaps from the mon we *also* learn the oldest/newest
map epochs; no need to query again.

Signed-off-by: Sage Weil <sage@redhat.com>
src/osd/OSD.cc

index eb484fb29af05feb79a6f579de9d0f9800c63909..6b45354754ddd6d414a7482efe05e40a6001e0f2 100644 (file)
@@ -6625,7 +6625,10 @@ void OSD::handle_osd_map(MOSDMap *m)
     osdmap_subscribe(osdmap->get_epoch()+1, true);
   }
   else if (is_booting()) {
-    start_boot();  // retry
+    if (m->get_source().is_mon())
+      _maybe_boot(m->oldest_map, m->newest_map);
+    else
+      start_boot();
   }
   else if (do_restart)
     start_boot();