From: Samuel Just <sam.just@inktank.com>
Date: Mon, 22 Jul 2013 18:08:04 +0000 (-0700)
Subject: OSD::_make_pg: use createmap, not osdmap
X-Git-Tag: v0.67-rc1~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0897d3a820ec182ebd74100a370dbadab50de84f;p=ceph.git

OSD::_make_pg: use createmap, not osdmap

The osd lock is not held at this point, we must use
the createmap passed in.

Fixes: #5656
Signed-off-by: Samuel Just <sam.just@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
---

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 8cc9e31459d6..464ed770df2d 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -1728,7 +1728,7 @@ PG* OSD::_make_pg(
   PG *pg;
   hobject_t logoid = make_pg_log_oid(pgid);
   hobject_t infooid = make_pg_biginfo_oid(pgid);
-  if (osdmap->get_pg_type(pgid) == pg_pool_t::TYPE_REP)
+  if (createmap->get_pg_type(pgid) == pg_pool_t::TYPE_REP)
     pg = new ReplicatedPG(&service, createmap, pool, pgid, logoid, infooid);
   else 
     assert(0);