]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
osdmap: set name_pool correctly in build_simple*()
authorSage Weil <sage@inktank.com>
Sat, 19 May 2012 20:24:35 +0000 (13:24 -0700)
committerSage Weil <sage@inktank.com>
Sun, 20 May 2012 21:12:16 +0000 (14:12 -0700)
Backport: dho
Signed-off-by: Sage Weil <sage@inktank.com>
src/osd/OSDMap.cc

index 401d5eda58775da1d4f7a00b2f16f790b5b18b20..01ca6060c1b93a864024142ff9a4205008ecd5e4 100644 (file)
@@ -1457,6 +1457,7 @@ void OSDMap::build_simple(CephContext *cct, epoch_t e, uuid_d &fsid,
     if (p->first == CEPH_DATA_RULE)
       pools[pool].crash_replay_interval = cct->_conf->osd_default_data_pool_replay_window;
     pool_name[pool] = p->second;
+    name_pool[p->second] = pool;
   }
 
   build_simple_crush_map(cct, *crush, rulesets, nosd);
@@ -1571,6 +1572,7 @@ void OSDMap::build_simple_from_conf(CephContext *cct, epoch_t e, uuid_d &fsid,
     if (p->first == CEPH_DATA_RULE)
       pools[pool].crash_replay_interval = cct->_conf->osd_default_data_pool_replay_window;
     pool_name[pool] = p->second;
+    name_pool[p->second] = pool;
   }
 
   build_simple_crush_map_from_conf(cct, *crush, rulesets);