From 991c93ed279dea52982a96cacdb7f761ba2ca5de Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 4 May 2012 16:02:00 -0700 Subject: [PATCH] mon: fix call to get_uuid() on non-existant osd Didn't catch this with vstart.sh testing. Signed-off-by: Sage Weil --- src/mon/OSDMonitor.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc index 32be93a221b90..ce33343f22541 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? -- 2.39.5