From: Sage Weil <sage@newdream.net>
Date: Fri, 4 May 2012 23:02:00 +0000 (-0700)
Subject: mon: fix call to get_uuid() on non-existant osd
X-Git-Tag: v0.47~39
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=991c93ed279dea52982a96cacdb7f761ba2ca5de;p=ceph.git

mon: fix call to get_uuid() on non-existant osd

Didn't catch this with vstart.sh testing.

Signed-off-by: Sage Weil <sage@newdream.net>
---

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index 32be93a221b9..ce33343f2254 100644
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -814,7 +814,7 @@ bool OSDMonitor::prepare_boot(MOSDBoot *m)
 
     // set uuid?
     dout(10) << " setting osd." << from << " uuid to " << m->sb.osd_fsid << dendl;
-    if (osdmap.get_uuid(from) != m->sb.osd_fsid)
+    if (!osdmap.exists(from) || osdmap.get_uuid(from) != m->sb.osd_fsid)
       pending_inc.new_uuid[from] = m->sb.osd_fsid;
 
     // fresh osd?