From: Sage Weil <sage@inktank.com>
Date: Sat, 20 Jul 2013 15:11:43 +0000 (-0700)
Subject: osd: do not assume we have an osdmap in prepare_to_stop
X-Git-Tag: v0.67-rc2~19^2~9^2~6
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b084a3877f3b585a6b387f42d625b33c9b759435;p=ceph.git

osd: do not assume we have an osdmap in prepare_to_stop

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

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 1ee4c09a63e1..695dff240a41 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -4730,11 +4730,12 @@ bool OSDService::prepare_to_stop()
   if (state != NOT_STOPPING)
     return false;
 
-  if (get_osdmap()->is_up(whoami)) {
+  OSDMapRef osdmap = get_osdmap();
+  if (osdmap && osdmap->is_up(whoami)) {
     state = PREPARING_TO_STOP;
     monc->send_mon_message(new MOSDMarkMeDown(monc->get_fsid(),
-					      get_osdmap()->get_inst(whoami),
-					      get_osdmap()->get_epoch(),
+					      osdmap->get_inst(whoami),
+					      osdmap->get_epoch(),
 					      false
 					      ));
     utime_t now = ceph_clock_now(g_ceph_context);