Skip to content

Commit

Permalink
osdmap: set name_pool correctly in build_simple*()
Browse files Browse the repository at this point in the history
Backport: dho
Signed-off-by: Sage Weil <[email protected]>
  • Loading branch information
Sage Weil committed May 20, 2012
1 parent 033be2b commit 5b39ae7
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions src/osd/OSDMap.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit 5b39ae7

Please sign in to comment.