From 2af422a5af8d9295167d48e6451b4a87162d4488 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Wed, 23 Sep 2015 17:31:50 -0400 Subject: [PATCH] osd: skip osdmap version query if we can 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 --- src/osd/OSD.cc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc index eb484fb29af05..6b45354754ddd 100644 --- a/src/osd/OSD.cc +++ b/src/osd/OSD.cc @@ -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(); -- 2.39.5