From: Sage Weil <sage@inktank.com>
Date: Sat, 19 May 2012 20:24:35 +0000 (-0700)
Subject: osdmap: set name_pool correctly in build_simple*()
X-Git-Tag: v0.47~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5b39ae7e495e668b89350f2bea042dcd086f723b;p=ceph.git

osdmap: set name_pool correctly in build_simple*()

Backport: dho
Signed-off-by: Sage Weil <sage@inktank.com>
---

diff --git a/src/osd/OSDMap.cc b/src/osd/OSDMap.cc
index 401d5eda587..01ca6060c1b 100644
--- a/src/osd/OSDMap.cc
+++ b/src/osd/OSDMap.cc
@@ -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);