From: Sage Weil <sage@redhat.com>
Date: Thu, 20 Jul 2017 21:44:58 +0000 (-0400)
Subject: osd: bail out if no map yet
X-Git-Tag: v12.1.2~184^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F16455%2Fhead;p=ceph.git

osd: bail out if no map yet

If we get pings before finishing our startup we may not yet have an
osdmap.

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 7a90a0a5faa..e0d3bd54abb 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -4699,7 +4699,11 @@ void OSD::handle_osd_ping(MOSDPing *m)
   }
 
   OSDMapRef curmap = service.get_osdmap();
-  assert(curmap);
+  if (!curmap) {
+    heartbeat_lock.Unlock();
+    m->put();
+    return;
+  }
 
   switch (m->op) {