diff options
| author | Samuel Just <sam.just@inktank.com> | 2013-07-22 11:08:04 -0700 |
|---|---|---|
| committer | Samuel Just <sam.just@inktank.com> | 2013-07-22 11:11:08 -0700 |
| commit | 0897d3a820ec182ebd74100a370dbadab50de84f (patch) | |
| tree | 9915805737fcdd8bdf61745eca97185589c8cb03 | |
| parent | 20bc09c668cca01bc1d27c0a860b384d85585ef5 (diff) | |
| download | ceph-0897d3a820ec182ebd74100a370dbadab50de84f.tar.gz | |
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>
| -rw-r--r-- | src/osd/OSD.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc index 8cc9e31459d..464ed770df2 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); |